summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@openvz.org>2009-11-08 16:16:45 +0300
committerIngo Molnar <mingo@elte.hu>2009-11-08 19:46:17 +0100
commitf4a70c55376683213229af7266dc57ad81aee354 (patch)
tree8128fe363917a92553c3eda6692c90aa57be34b4 /arch/x86/kernel
parent4343fe1024e09e17667f95620ed3e69a7a5f4389 (diff)
downloadblackbird-op-linux-f4a70c55376683213229af7266dc57ad81aee354.tar.gz
blackbird-op-linux-f4a70c55376683213229af7266dc57ad81aee354.zip
x86, apic: Get rid of apicid_to_cpu_present assign on 64-bit
In fact it's never get used on x86-64 (for 64 bit platform we use differ technique to enumerate io-units). Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20091108131645.GD5300@lenovo> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic/apic_noop.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 9ab6ffb313ac..89629f622b60 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -162,7 +162,12 @@ struct apic apic_noop = {
.cpu_to_logical_apicid = noop_cpu_to_logical_apicid,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
+
+#ifdef CONFIG_X86_32
.apicid_to_cpu_present = default_apicid_to_cpu_present,
+#else
+ .apicid_to_cpu_present = NULL,
+#endif
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
OpenPOWER on IntegriCloud