aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-21 14:30:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-21 14:30:37 -0700
commitf62378fcfc9c13a57b0b69dbd43336a4df8155a5 (patch)
treeb2682850f0d15079e0618ee09a23ba7ee71df55b /arch/arm/kernel/traps.c
parenta418500b42c5c54f3f9d68036950c701740a2765 (diff)
parent6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff)
downloadkernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.zip
kernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.tar.gz
kernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4554c96..e7d22db 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -624,6 +624,9 @@ void __attribute__((noreturn)) __bug(const char *file, int line, void *data)
printk(" - extra data = %p", data);
printk("\n");
*(int *)0 = 0;
+
+ /* Avoid "noreturn function does return" */
+ for (;;);
}
EXPORT_SYMBOL(__bug);