Skip to contentSkip to conversation

x86: smp.h move boot_cpu_id declartion to cpu.h

PATCH New Jaswinder Singh Rajput 1 participant 1 message Jan 7, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 7/7 x86: smp.h move boot_cpu_id declartion to cpu.h

Impact: cleanup, moving NON-SMP stuff from smp.h

---
 arch/x86/include/asm/cpu.h   |    7 +++++++
 arch/x86/include/asm/smp.h   |    6 ------
 arch/x86/kernel/cpu/common.c |    2 +-
 arch/x86/kernel/io_apic.c    |    1 +
 drivers/pci/intr_remapping.c |    1 +
 5 files changed, 10 insertions(+), 7 deletions(-)
arch/x86/include/asm/cpu.h +7 -0
index 89edafb..f03b23e 100644
@@ -31,4 +31,11 @@ extern void arch_unregister_cpu(int);
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);
+
+#ifdef CONFIG_X86_HAS_BOOT_CPU_ID
+extern unsigned char boot_cpu_id;
+#else
+#define boot_cpu_id				0
+#endif
+
 #endif /* _ASM_X86_CPU_H */
arch/x86/include/asm/smp.h +0 -6
index 136f1c7..1963e27 100644
@@ -238,11 +238,5 @@ static inline int hard_smp_processor_id(void)
 
 #endif /* CONFIG_X86_LOCAL_APIC */
 
-#ifdef CONFIG_X86_HAS_BOOT_CPU_ID
-extern unsigned char boot_cpu_id;
-#else
-#define boot_cpu_id	0
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_X86_SMP_H */
arch/x86/kernel/cpu/common.c +1 -1
index 667e5d5..693f3b9 100644
@@ -21,7 +21,7 @@
 #include <asm/pat.h>
 #include <asm/asm.h>
 #include <asm/numa.h>
-#include <asm/smp.h>
+#include <asm/cpu.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
arch/x86/kernel/io_apic.c +1 -0
index 1c4a130..109c91d 100644
@@ -46,6 +46,7 @@
 #include <asm/idle.h>
 #include <asm/io.h>
 #include <asm/smp.h>
+#include <asm/cpu.h>
 #include <asm/desc.h>
 #include <asm/proto.h>
 #include <asm/acpi.h>
drivers/pci/intr_remapping.c +1 -0
index f78371b..5a57753 100644
@@ -6,6 +6,7 @@
 #include <linux/irq.h>
 #include <asm/io_apic.h>
 #include <asm/smp.h>
+#include <asm/cpu.h>
 #include <linux/intel-iommu.h>
 #include "intr_remapping.h"
 
Signature · 1 line
1.5.6.6