diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
| commit | 0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch) | |
| tree | 528681b043e947cfc51527d56098f586b6dfa217 /arch/s390/lib/delay.c | |
| parent | 5815449d1bfcb22f74b0e36a8b0631d6584cb7fc (diff) | |
| parent | 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/s390/lib/delay.c')
| -rw-r--r-- | arch/s390/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index e96c35bddac7..71f0a2fb3078 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c | |||
| @@ -30,7 +30,7 @@ void __delay(unsigned long loops) | |||
| 30 | */ | 30 | */ |
| 31 | __asm__ __volatile__( | 31 | __asm__ __volatile__( |
| 32 | "0: brct %0,0b" | 32 | "0: brct %0,0b" |
| 33 | : /* no outputs */ : "r" (loops/2) ); | 33 | : /* no outputs */ : "r" ((loops/2) + 1)); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | /* | 36 | /* |