From 28aa29eeb3918f820b914679cfc4404972f2df32 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 14:36:42 +0100
Subject: [PATCH] remove: genapic prepare
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/genapic.h | 13 +------------
arch/x86/kernel/probe_32.c | 9 +++++++++
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index a6d0b00a544c..9b874a386837 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -168,8 +168,6 @@ extern void apic_send_IPI_self(int vector);
extern struct genapic apic_x2apic_uv_x;
DECLARE_PER_CPU(int, x2apic_extra_bits);
-extern void default_setup_apic_routing(void);
-
extern int default_cpu_present_to_apicid(int mps_cpu);
extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
#endif
@@ -211,10 +209,9 @@ static inline unsigned int read_apic_id(void)
return apic->get_apic_id(reg);
}
-#ifdef CONFIG_X86_64
extern void default_setup_apic_routing(void);
-#else
+#ifdef CONFIG_X86_32
/*
* Set up the logical destination ID.
*
@@ -251,14 +248,6 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
return cpuid_apic >> index_msb;
}
-static inline void default_setup_apic_routing(void)
-{
-#ifdef CONFIG_X86_IO_APIC
- printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
- "Flat", nr_ioapics);
-#endif
-}
-
extern int default_apicid_to_node(int logical_apicid);
#endif
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 6e31b17d546d..b3d5d74e5229 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -53,6 +53,15 @@ int no_broadcast = DEFAULT_SEND_IPI;
#ifdef CONFIG_X86_LOCAL_APIC
+void default_setup_apic_routing(void)
+{
+#ifdef CONFIG_X86_IO_APIC
+ printk(KERN_INFO
+ "Enabling APIC mode: Flat. Using %d I/O APICs\n",
+ nr_ioapics);
+#endif
+}
+
static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
/*