git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
traps.c
diff --git
a/arch/arm/kernel/traps.c
b/arch/arm/kernel/traps.c
index
35230a0
..
4ac8dc8
100644
(file)
--- a/
arch/arm/kernel/traps.c
+++ b/
arch/arm/kernel/traps.c
@@
-12,7
+12,6
@@
* 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably
* kill the offending process.
*/
* 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably
* kill the offending process.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/signal.h>
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/signal.h>
#include <linux/spinlock.h>
@@
-28,6
+27,7
@@
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include <asm/traps.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include <asm/traps.h>
+#include <asm/io.h>
#include "ptrace.h"
#include "signal.h"
#include "ptrace.h"
#include "signal.h"
@@
-192,7
+192,7
@@
void show_stack(struct task_struct *tsk, unsigned long *sp)
if (tsk != current)
fp = thread_saved_fp(tsk);
else
if (tsk != current)
fp = thread_saved_fp(tsk);
else
- asm("mov
%? %0, fp" : "=r" (fp)
);
+ asm("mov
%0, fp" : "=r" (fp) : : "cc"
);
c_backtrace(fp, 0x10);
barrier();
c_backtrace(fp, 0x10);
barrier();
@@
-206,8
+206,8
@@
static void __die(const char *str, int err, struct thread_info *thread, struct p
printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
print_modules();
__show_regs(regs);
printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
print_modules();
__show_regs(regs);
- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
- tsk->comm, tsk->pid, thread + 1);
+ printk("Process %s (pid: %d
:#%u
, stack limit = 0x%p)\n",
+ tsk->comm, tsk->pid, t
sk->xid, t
hread + 1);
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
@@
-233,11
+233,8
@@
NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
bust_spinlocks(0);
spin_unlock_irq(&die_lock);
bust_spinlocks(0);
spin_unlock_irq(&die_lock);
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
+ if (panic_on_oops)
panic("Fatal exception");
panic("Fatal exception");
- }
do_exit(SIGSEGV);
}
do_exit(SIGSEGV);
}
@@
-635,12
+632,9
@@
baddataabort(int code, unsigned long instr, struct pt_regs *regs)
notify_die("unknown data abort code", regs, &info, instr, 0);
}
notify_die("unknown data abort code", regs, &info, instr, 0);
}
-void __attribute__((noreturn)) __bug(const char *file, int line
, void *data
)
+void __attribute__((noreturn)) __bug(const char *file, int line)
{
{
- printk(KERN_CRIT"kernel BUG at %s:%d!", file, line);
- if (data)
- printk(" - extra data = %p", data);
- printk("\n");
+ printk(KERN_CRIT"kernel BUG at %s:%d!\n", file, line);
*(int *)0 = 0;
/* Avoid "noreturn function does return" */
*(int *)0 = 0;
/* Avoid "noreturn function does return" */