diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
| commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
| tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /arch/i386/kernel/traps.c | |
| parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/traps.c')
| -rw-r--r-- | arch/i386/kernel/traps.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index c34d1bfc5161..f0dffa03fbba 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
| @@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code) | |||
| 650 | 650 | ||
| 651 | cpu = smp_processor_id(); | 651 | cpu = smp_processor_id(); |
| 652 | 652 | ||
| 653 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 654 | if (!cpu_online(cpu)) { | ||
| 655 | nmi_exit(); | ||
| 656 | return; | ||
| 657 | } | ||
| 658 | #endif | ||
| 659 | |||
| 660 | ++nmi_count(cpu); | 653 | ++nmi_count(cpu); |
| 661 | 654 | ||
| 662 | if (!rcu_dereference(nmi_callback)(regs, cpu)) | 655 | if (!rcu_dereference(nmi_callback)(regs, cpu)) |