hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/x86/xen/apic.c
....@@ -1,8 +1,10 @@
11 // SPDX-License-Identifier: GPL-2.0
22 #include <linux/init.h>
3
+#include <linux/thread_info.h>
34
45 #include <asm/x86_init.h>
56 #include <asm/apic.h>
7
+#include <asm/io_apic.h>
68 #include <asm/xen/hypercall.h>
79
810 #include <xen/xen.h>
....@@ -58,10 +60,6 @@
5860
5961 if (reg == APIC_LVR)
6062 return 0x14;
61
-#ifdef CONFIG_X86_32
62
- if (reg == APIC_LDR)
63
- return SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
64
-#endif
6563 if (reg != APIC_ID)
6664 return 0;
6765
....@@ -127,14 +125,6 @@
127125 return initial_apic_id >> index_msb;
128126 }
129127
130
-#ifdef CONFIG_X86_32
131
-static int xen_x86_32_early_logical_apicid(int cpu)
132
-{
133
- /* Match with APIC_LDR read. Otherwise setup_local_APIC complains. */
134
- return 1 << cpu;
135
-}
136
-#endif
137
-
138128 static void xen_noop(void)
139129 {
140130 }
....@@ -197,11 +187,6 @@
197187 .icr_write = xen_apic_icr_write,
198188 .wait_icr_idle = xen_noop,
199189 .safe_wait_icr_idle = xen_safe_apic_wait_icr_idle,
200
-
201
-#ifdef CONFIG_X86_32
202
- /* generic_processor_info and setup_local_APIC. */
203
- .x86_32_early_logical_apicid = xen_x86_32_early_logical_apicid,
204
-#endif
205190 };
206191
207192 static void __init xen_apic_check(void)