diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-05-19 13:39:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-02 09:58:19 +0100 |
| commit | 31cd08c3a1db4b3164567a2a424b5e5dba6ce7a3 (patch) | |
| tree | 492379ed8dff6c81b8c2b84ff9268414bcbd77d9 | |
| parent | 45b0fa09c6e47c02ac0a08bd2b3c6a73480222e0 (diff) | |
| download | linux-rt-31cd08c3a1db4b3164567a2a424b5e5dba6ce7a3.tar.gz | |
ARM: remove __bad_xchg definition
We want link errors if xchg() is called for a variable size we do not
support.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/cmpxchg.h | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/traps.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h index abb2c3769b01..f4d74ab3ec1f 100644 --- a/arch/arm/include/asm/cmpxchg.h +++ b/arch/arm/include/asm/cmpxchg.h @@ -94,6 +94,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size break; #endif default: + /* Cause a link-time error, the xchg() size is not supported */ __bad_xchg(ptr, size), ret = 0; break; } diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 3dce1a342030..d358226236f2 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -749,14 +749,6 @@ late_initcall(arm_mrc_hook_init); #endif -void __bad_xchg(volatile void *ptr, int size) -{ - pr_err("xchg: bad data size: pc 0x%p, ptr 0x%p, size %d\n", - __builtin_return_address(0), ptr, size); - BUG(); -} -EXPORT_SYMBOL(__bad_xchg); - /* * A data abort trap was taken, but we did not handle the instruction. * Try to abort the user program, or panic if it was the kernel. |