diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:21:22 -0800 |
| commit | 0a528ace2ea013fe60efaf633084b154962bfdbb (patch) | |
| tree | 4e038736f3e5ff9eece35f5c2a8efcbb4487a477 /include/asm-cris/delay.h | |
| parent | 8b29e8edf0ed8f63ecb35b16946f222854d74ad0 (diff) | |
v2.4.10.5 -> v2.4.10.6
- various: fix some module exports uncovered by stricter error checking
- Urban Widmark: make smbfs use same error define names as samba and win32
- Greg KH: USB update
- Tom Rini: MPC8xx ppc update
- Matthew Wilcox: rd.c page cache flushing fix
- Richard Gooch: devfs race fix: rwsem for symlinks
- Björn Wesen: Cris arch update
- Nikita Danilov: reiserfs cleanup
- Tim Waugh: parport update
- Peter Rival: update alpha SMP bootup to match wait_init_idle fixes
- Trond Myklebust: lockd/grace period fix
Diffstat (limited to 'include/asm-cris/delay.h')
| -rw-r--r-- | include/asm-cris/delay.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h index a9a848dd3b07..632c369c41b9 100644 --- a/include/asm-cris/delay.h +++ b/include/asm-cris/delay.h @@ -1,5 +1,3 @@ -/* $Id: delay.h,v 1.5 2001/06/28 04:59:25 hp Exp $ */ - #ifndef _CRIS_DELAY_H #define _CRIS_DELAY_H @@ -21,12 +19,12 @@ extern void __do_delay(void); /* Special register call calling convention */ extern __inline__ void __delay(int loops) { __asm__ __volatile__ ( - "move.d %0,r9\n\t" + "move.d %0,$r9\n\t" "beq 2f\n\t" - "subq 1,r9\n\t" + "subq 1,$r9\n\t" "1:\n\t" "bne 1b\n\t" - "subq 1,r9\n" + "subq 1,$r9\n" "2:" : : "g" (loops) : "r9"); } |