diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (patch) | |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c /arch/x86/kernel/apic/nmi.c | |
| parent | 12a81c8df13c60904febcafcf6b90ca1acb67122 (diff) | |
| parent | eb703f98191a505f78d0066712ad67d5dedc4c90 (diff) | |
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/nmi.c')
| -rw-r--r-- | arch/x86/kernel/apic/nmi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c index 1edaf15c0b8e..a43f71cb30f8 100644 --- 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) | |||
| 401 | int cpu = smp_processor_id(); | 401 | int cpu = smp_processor_id(); |
| 402 | int rc = 0; | 402 | int rc = 0; |
| 403 | 403 | ||
| 404 | /* check for other users first */ | ||
| 405 | if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT) | ||
| 406 | == NOTIFY_STOP) { | ||
| 407 | rc = 1; | ||
| 408 | touched = 1; | ||
| 409 | } | ||
| 410 | |||
| 411 | sum = get_timer_irqs(cpu); | 404 | sum = get_timer_irqs(cpu); |
| 412 | 405 | ||
| 413 | if (__get_cpu_var(nmi_touch)) { | 406 | if (__get_cpu_var(nmi_touch)) { |