[PATCH] arch: x86: kernel: apic: Remove unnecessary ifdef

From: Andreas Ruprecht
Date: Wed Aug 20 2014 - 04:15:51 EST


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@xxxxxxxxxxxx>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 004f017..8e9dcfd 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;
}

--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/