diff options
author | Don Zickus <dzickus@redhat.com> | 2010-11-12 11:22:24 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 03:08:23 -0500 |
commit | 072b198a4ad48bd722ec6d203d65422a4698eae7 (patch) | |
tree | 1b932d01a88b896b1548cca36e2e6d696055f0f4 /arch/x86/kernel/apic/apic.c | |
parent | 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a (diff) |
x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog
Now that the bulk of the old nmi_watchdog is gone, remove all
the stub variables and hooks associated with it.
This touches lots of files mainly because of how the io_apic
nmi_watchdog was implemented. Now that the io_apic nmi_watchdog
is forever gone, remove all its fingers.
Most of this code was not being exercised by virtue of
nmi_watchdog != NMI_IO_APIC, so there shouldn't be anything to
risky here.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: fweisbec@gmail.com
Cc: gorcunov@openvz.org
LKML-Reference: <1289578944-28564-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 3f838d537392..e9e2a93783f9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <linux/cpu.h> | 32 | #include <linux/cpu.h> |
33 | #include <linux/dmi.h> | 33 | #include <linux/dmi.h> |
34 | #include <linux/nmi.h> | ||
35 | #include <linux/smp.h> | 34 | #include <linux/smp.h> |
36 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
37 | 36 | ||
@@ -799,11 +798,7 @@ void __init setup_boot_APIC_clock(void) | |||
799 | * PIT/HPET going. Otherwise register lapic as a dummy | 798 | * PIT/HPET going. Otherwise register lapic as a dummy |
800 | * device. | 799 | * device. |
801 | */ | 800 | */ |
802 | if (nmi_watchdog != NMI_IO_APIC) | 801 | lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; |
803 | lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; | ||
804 | else | ||
805 | pr_warning("APIC timer registered as dummy," | ||
806 | " due to nmi_watchdog=%d!\n", nmi_watchdog); | ||
807 | 802 | ||
808 | /* Setup the lapic or request the broadcast */ | 803 | /* Setup the lapic or request the broadcast */ |
809 | setup_APIC_timer(); | 804 | setup_APIC_timer(); |
@@ -1387,7 +1382,6 @@ void __cpuinit end_local_APIC_setup(void) | |||
1387 | } | 1382 | } |
1388 | #endif | 1383 | #endif |
1389 | 1384 | ||
1390 | setup_apic_nmi_watchdog(NULL); | ||
1391 | apic_pm_activate(); | 1385 | apic_pm_activate(); |
1392 | } | 1386 | } |
1393 | 1387 | ||
@@ -1750,17 +1744,10 @@ int __init APIC_init_uniprocessor(void) | |||
1750 | setup_IO_APIC(); | 1744 | setup_IO_APIC(); |
1751 | else { | 1745 | else { |
1752 | nr_ioapics = 0; | 1746 | nr_ioapics = 0; |
1753 | localise_nmi_watchdog(); | ||
1754 | } | 1747 | } |
1755 | #else | ||
1756 | localise_nmi_watchdog(); | ||
1757 | #endif | 1748 | #endif |
1758 | 1749 | ||
1759 | x86_init.timers.setup_percpu_clockev(); | 1750 | x86_init.timers.setup_percpu_clockev(); |
1760 | #ifdef CONFIG_X86_64 | ||
1761 | check_nmi_watchdog(); | ||
1762 | #endif | ||
1763 | |||
1764 | return 0; | 1751 | return 0; |
1765 | } | 1752 | } |
1766 | 1753 | ||