diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-23 02:30:39 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-23 02:30:39 +0100 |
| commit | 8e206637c86fec3e38480aa5bad4e8c8295365ca (patch) | |
| tree | 4c59b7794125403e26762328a74cc7a4d5e822d4 /include | |
| parent | 3fd970f0350f8627e45f68259e787f0ec08589a4 (diff) | |
[ARM] Fixups for GCC 3.x:
- Provide an ARM architecture major version number so we can use the
preprocessor more effectively to select features that ARMv4 and
above contain.
- Fix GCC 3.1 multi-line __asm__ build warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/proc-armv/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h index bc61642284fa..64ccb9c06c6c 100644 --- a/include/asm-arm/proc-armv/system.h +++ b/include/asm-arm/proc-armv/system.h @@ -36,7 +36,7 @@ extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ extern unsigned long cr_alignment; /* defined in entry-armv.S */ -#ifdef __ARM_ARCH_4__ +#if __LINUX_ARM_ARCH__ >= 4 #define vectors_base() ((cr_alignment & CR_V) ? 0xffff0000 : 0) #else #define vectors_base() (0) @@ -192,7 +192,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size : "memory"); break; #endif - default: __bad_xchg(ptr, size); + default: __bad_xchg(ptr, size), ret = 0; } return ret; |