diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
| commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
| tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /arch/arm/kernel/traps.c | |
| parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) | |
Merge with 2.3.99-pre9.
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 18d9931ee..1d692dd35 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -399,13 +399,13 @@ void __bug(const char *file, int line, void *data) printk(KERN_CRIT"kernel BUG at %s:%d!\n", file, line); if (data) printk(KERN_CRIT"extra data = %p\n", data); - *(int *)0 = 0; + BUG(); } void __readwrite_bug(const char *fn) { printk("%s called, but not implemented", fn); - *(int *)0 = 0; + BUG(); } void __pte_error(const char *file, int line, unsigned long val) @@ -436,7 +436,7 @@ void abort(void) printk(KERN_CRIT "abort() called from %p! (Please " "report to rmk@arm.linux.org.uk)\n", lr); - *(int *)0 = 0; + BUG(); /* if that doesn't kill us, halt */ panic("Oops failed to kill thread"); |