git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc7' into perf/nmi
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
nmi.c
diff --git
a/arch/x86/kernel/apic/nmi.c
b/arch/x86/kernel/apic/nmi.c
index
1edaf15
..
a43f71c
100644
(file)
--- a/
arch/x86/kernel/apic/nmi.c
+++ b/
arch/x86/kernel/apic/nmi.c
@@
-401,13
+401,6
@@
nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
int cpu = smp_processor_id();
int rc = 0;
- /* check for other users first */
- if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT)
- == NOTIFY_STOP) {
- rc = 1;
- touched = 1;
- }
-
sum = get_timer_irqs(cpu);
if (__get_cpu_var(nmi_touch)) {