default_init_apic_ldr only exists for use in the 32-bit-only
arch/x86/kernel/apic/probe_32.c, and asm/apic.h prototypes it in an
ifdef CONFIG_X86_32 block, but arch/x86/kernel/apic/apic.c defines the
function unconditionally. Wrap the definition in an ifdef CONFIG_X86_32
block.
Signed-off-by: Josh Triplett <j...@joshtriplett.org>
---
arch/x86/kernel/apic/apic.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 5a92aeb..bce0492 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2113,6 +2113,7 @@ int hard_smp_processor_id(void)
return read_apic_id();
}
+#ifdef CONFIG_X86_32
void default_init_apic_ldr(void)
{
unsigned long val;
@@ -2122,6 +2123,7 @@ void default_init_apic_ldr(void)
val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
apic_write(APIC_LDR, val);
}
+#endif
int default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
const struct cpumask *andmask,
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
