diff options
| author | Linus Torvalds | 2011-05-27 19:18:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-27 19:18:00 +0200 |
| commit | 95948c31bec26e631ecf138cb04dcd547519c7af (patch) | |
| tree | 10a56e8c9635131bcbef28721443b63b39642840 /arch/s390/include/asm/delay.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | [S390] mm: add ZONE_DMA to 31-bit config again (diff) | |
| download | kernel-qcow2-linux-95948c31bec26e631ecf138cb04dcd547519c7af.tar.gz kernel-qcow2-linux-95948c31bec26e631ecf138cb04dcd547519c7af.tar.xz kernel-qcow2-linux-95948c31bec26e631ecf138cb04dcd547519c7af.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] mm: add ZONE_DMA to 31-bit config again
[S390] mm: add page fault retry handling
[S390] mm: handle kernel caused page fault oom situations
[S390] delay: implement ndelay
[S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
[S390] hwsampler: allow cpu hotplug
[S390] uaccess: turn __access_ok() into a define
[S390] irq: merge irq.c and s390_ext.c
[S390] irq: fix service signal external interrupt handling
[S390] pfault: always enable service signal interrupt
Diffstat (limited to 'arch/s390/include/asm/delay.h')
| -rw-r--r-- | arch/s390/include/asm/delay.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h index 8a096b83f51f..0e3b35f96be1 100644 --- a/arch/s390/include/asm/delay.h +++ b/arch/s390/include/asm/delay.h @@ -14,10 +14,12 @@ #ifndef _S390_DELAY_H #define _S390_DELAY_H -extern void __udelay(unsigned long long usecs); -extern void udelay_simple(unsigned long long usecs); -extern void __delay(unsigned long loops); +void __ndelay(unsigned long long nsecs); +void __udelay(unsigned long long usecs); +void udelay_simple(unsigned long long usecs); +void __delay(unsigned long loops); +#define ndelay(n) __ndelay((unsigned long long) (n)) #define udelay(n) __udelay((unsigned long long) (n)) #define mdelay(n) __udelay((unsigned long long) (n) * 1000) |