diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 10:22:09 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 11:53:56 -0500 |
commit | ab6fb7c0b03e2c3286f316c840347be8b9ee3d9f (patch) | |
tree | 044aa5a7e201f64656b0d936e8d5cd8572b8b356 /arch/x86/kernel/smpboot.c | |
parent | cb81eaedf12d3e5e6e3dcf3320089660f7fb7464 (diff) |
x86, apic: remove ->store_NMI_vector()
Impact: cleanup
It's not used by anything anymore.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 09e73876a44f..9ce666387f37 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -745,21 +745,21 @@ static void __cpuinit do_fork_idle(struct work_struct *work) | |||
745 | complete(&c_idle->done); | 745 | complete(&c_idle->done); |
746 | } | 746 | } |
747 | 747 | ||
748 | static int __cpuinit do_boot_cpu(int apicid, int cpu) | ||
749 | /* | 748 | /* |
750 | * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad | 749 | * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad |
751 | * (ie clustered apic addressing mode), this is a LOGICAL apic ID. | 750 | * (ie clustered apic addressing mode), this is a LOGICAL apic ID. |
752 | * Returns zero if CPU booted OK, else error code from ->wakeup_cpu. | 751 | * Returns zero if CPU booted OK, else error code from ->wakeup_cpu. |
753 | */ | 752 | */ |
753 | static int __cpuinit do_boot_cpu(int apicid, int cpu) | ||
754 | { | 754 | { |
755 | unsigned long boot_error = 0; | 755 | unsigned long boot_error = 0; |
756 | int timeout; | ||
757 | unsigned long start_ip; | 756 | unsigned long start_ip; |
758 | unsigned short nmi_high = 0, nmi_low = 0; | 757 | int timeout; |
759 | struct create_idle c_idle = { | 758 | struct create_idle c_idle = { |
760 | .cpu = cpu, | 759 | .cpu = cpu, |
761 | .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), | 760 | .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), |
762 | }; | 761 | }; |
762 | |||
763 | INIT_WORK(&c_idle.work, do_fork_idle); | 763 | INIT_WORK(&c_idle.work, do_fork_idle); |
764 | 764 | ||
765 | alternatives_smp_switch(1); | 765 | alternatives_smp_switch(1); |
@@ -824,9 +824,6 @@ do_rest: | |||
824 | 824 | ||
825 | pr_debug("Setting warm reset code and vector.\n"); | 825 | pr_debug("Setting warm reset code and vector.\n"); |
826 | 826 | ||
827 | if (apic->store_NMI_vector) | ||
828 | apic->store_NMI_vector(&nmi_high, &nmi_low); | ||
829 | |||
830 | smpboot_setup_warm_reset_vector(start_ip); | 827 | smpboot_setup_warm_reset_vector(start_ip); |
831 | /* | 828 | /* |
832 | * Be paranoid about clearing APIC errors. | 829 | * Be paranoid about clearing APIC errors. |