lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

Browse Source
This commit is contained in:
Ralf Baechle
2012-01-11 15:42:31 +01:00
parent 7a5c3b8c5c f77138e8d5 b606d5ae90 b15a6d62b5 df0ac8a406 876f116618 d7a887a73d 6457a396bb 5611cc4572 ff5d7265cf b3ea581834
commit 7bf6612e8a
194 changed files with 15445 additions and 2375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mips/kernel/traps.c
View File

@@ -91,6 +91,7 @@ int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
void (*board_nmi_handler_setup)(void);
void (*board_ejtag_handler_setup)(void);
void (*board_bind_eic_interrupt)(int irq, int regset);
void (*board_ebase_setup)(void);
static void show_raw_backtrace(unsigned long reg29)
@@ -1339,9 +1340,18 @@ void ejtag_exception_handler(struct pt_regs *regs)
/*
* NMI exception handler.
* No lock; only written during early bootup by CPU 0.
*/
static RAW_NOTIFIER_HEAD(nmi_chain);
int register_nmi_notifier(struct notifier_block *nb)
{
return raw_notifier_chain_register(&nmi_chain, nb);
}
NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
{
raw_notifier_call_chain(&nmi_chain, 0, regs);
bust_spinlocks(1);
printk("NMI taken!!!!\n");
die("NMI", regs);
@@ -1682,6 +1692,8 @@ void __init trap_init(void)
ebase += (read_c0_ebase() & 0x3ffff000);
}
if (board_ebase_setup)
board_ebase_setup();
per_cpu_trap_init();
/*