diff options
author | Andreas Ruprecht <rupran@einserver.de> | 2014-08-20 04:16:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-08-20 09:05:30 -0400 |
commit | 8091c1f8ea2374695c105591179b1269fb5f2fbb (patch) | |
tree | 99ae390bef2d7398bcb4f1a38a148261425a7409 | |
parent | 98a96f202203fecad65b44449077c695686ad4db (diff) |
x86/apic/uv: Remove unnecessary #ifdef
In the file x2apic_uv_x.c, some code is compiled conditionally
depending on CONFIG_SMP. However, the file is only built, if
CONFIG_X86_UV is enabled.
CONFIG_X86_UV depends on CONFIG_NUMA, which itself depends on
CONFIG_SMP, so the #ifdef will always evaluate to true, if the
file is compiled. Thus, it is unnecessary and can be removed.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Link: http://lkml.kernel.org/r/1408522561-23389-1-git-send-email-rupran@einserver.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-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 293b41df54ef..2f1b5e0df660 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); | |||
204 | 204 | ||
205 | static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) | 205 | static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) |
206 | { | 206 | { |
207 | #ifdef CONFIG_SMP | ||
208 | unsigned long val; | 207 | unsigned long val; |
209 | int pnode; | 208 | int pnode; |
210 | 209 | ||
@@ -223,7 +222,6 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) | |||
223 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); | 222 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); |
224 | 223 | ||
225 | atomic_set(&init_deasserted, 1); | 224 | atomic_set(&init_deasserted, 1); |
226 | #endif | ||
227 | return 0; | 225 | return 0; |
228 | } | 226 | } |
229 | 227 | ||