diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-02-14 13:53:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 16:09:35 -0800 |
| commit | e35a6619e7be59aa38249346327c89207663bb37 (patch) | |
| tree | 937b4ef45b317dd1b6854c9c5682af3ddeb55faf /arch | |
| parent | 5a1342f77304da8dc698e0ecf09925438764d80f (diff) | |
| download | linux-stable-e35a6619e7be59aa38249346327c89207663bb37.tar.gz linux-stable-e35a6619e7be59aa38249346327c89207663bb37.tar.bz2 linux-stable-e35a6619e7be59aa38249346327c89207663bb37.zip | |
[PATCH] s390: fix __delay implementation
Fix __delay implementation. Called with an argument "1" or "0" it would
loop nearly forever (since (1/2)-1 = 0xffffffff).
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -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) */ __asm__ __volatile__( "0: brct %0,0b" - : /* no outputs */ : "r" (loops/2) ); + : /* no outputs */ : "r" ((loops/2) + 1)); } /* |