diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-07 13:00:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-07 13:00:21 +0200 |
| commit | 69843f8383fa86ca73fe5f557b6c87becad895d1 (patch) | |
| tree | 95653e06aacb6f6df4f16634335040fd1def9968 | |
| parent | 4d799b5541d70b0940e014e9b977406853224e99 (diff) | |
| parent | 8091c1f8ea2374695c105591179b1269fb5f2fbb (diff) | |
| download | tip-69843f8383fa86ca73fe5f557b6c87becad895d1.tar.gz | |
Merge branch 'x86/uv'auto-latest
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 004f017aa7b9e6..8e9dcfd630e4b5 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -204,7 +204,6 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second); static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) { -#ifdef CONFIG_SMP unsigned long val; int pnode; @@ -223,7 +222,6 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) uv_write_global_mmr64(pnode, UVH_IPI_INT, val); atomic_set(&init_deasserted, 1); -#endif return 0; } |