diff options
| author | Chris Zankel | 2005-06-30 11:59:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-30 17:45:11 +0200 |
| commit | 9ec55a9bd365dfc78945bb8e6bf5d0fdf1d75ad0 (patch) | |
| tree | a7299a8e320b2205426a7e030db61b44ce1887c7 /include | |
| parent | [PATCH] xtensa: Removed local copy of zlib and fixed O= support (diff) | |
| download | kernel-qcow2-linux-9ec55a9bd365dfc78945bb8e6bf5d0fdf1d75ad0.tar.gz kernel-qcow2-linux-9ec55a9bd365dfc78945bb8e6bf5d0fdf1d75ad0.tar.xz kernel-qcow2-linux-9ec55a9bd365dfc78945bb8e6bf5d0fdf1d75ad0.zip | |
[PATCH] xtensa: Fix asm macro
Removed dead code in arch/xtensa/kernel/pci.c and use the pci_name() macro.
Fixed an error in the delay asm macro: '1' is an invalid immediate value.
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-xtensa/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h index 6359c55e77a8..0a123d53a636 100644 --- a/include/asm-xtensa/delay.h +++ b/include/asm-xtensa/delay.h @@ -21,7 +21,7 @@ extern unsigned long loops_per_jiffy; extern __inline__ void __delay(unsigned long loops) { /* 2 cycles per loop. */ - __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 1, 1b" + __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 2, 1b" : "=r" (loops) : "0" (loops)); } |