aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@infradead.org>2009-01-07 11:08:59 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-07 15:48:26 -0500
commit6d652ea1d056390a0c33db92b44ed219284b71af (patch)
treee8914b59fcfc60345b75241fc7d43c664ff96424
parentaf8968abf09fe5984bdd206e54e0eeb1dc1fa29c (diff)
x86: smp.h move boot_cpu_id declartion to cpu.h
Impact: cleanup Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/include/asm/cpu.h7
-rw-r--r--arch/x86/include/asm/smp.h6
-rw-r--r--arch/x86/kernel/io_apic.c1
-rw-r--r--drivers/pci/intr_remapping.c1
4 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 89edafb93390..f03b23e32864 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -31,4 +31,11 @@ extern void arch_unregister_cpu(int);
31#endif 31#endif
32 32
33DECLARE_PER_CPU(int, cpu_state); 33DECLARE_PER_CPU(int, cpu_state);
34
35#ifdef CONFIG_X86_HAS_BOOT_CPU_ID
36extern unsigned char boot_cpu_id;
37#else
38#define boot_cpu_id 0
39#endif
40
34#endif /* _ASM_X86_CPU_H */ 41#endif /* _ASM_X86_CPU_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index c975b6f83c68..74ad9ef6ae02 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -212,11 +212,5 @@ static inline int hard_smp_processor_id(void)
212 212
213#endif /* CONFIG_X86_LOCAL_APIC */ 213#endif /* CONFIG_X86_LOCAL_APIC */
214 214
215#ifdef CONFIG_X86_HAS_BOOT_CPU_ID
216extern unsigned char boot_cpu_id;
217#else
218#define boot_cpu_id 0
219#endif
220
221#endif /* __ASSEMBLY__ */ 215#endif /* __ASSEMBLY__ */
222#endif /* _ASM_X86_SMP_H */ 216#endif /* _ASM_X86_SMP_H */
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 1c4a1302536c..109c91db2026 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -46,6 +46,7 @@
46#include <asm/idle.h> 46#include <asm/idle.h>
47#include <asm/io.h> 47#include <asm/io.h>
48#include <asm/smp.h> 48#include <asm/smp.h>
49#include <asm/cpu.h>
49#include <asm/desc.h> 50#include <asm/desc.h>
50#include <asm/proto.h> 51#include <asm/proto.h>
51#include <asm/acpi.h> 52#include <asm/acpi.h>
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index f78371b22529..5a57753ea9fc 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -6,6 +6,7 @@
6#include <linux/irq.h> 6#include <linux/irq.h>
7#include <asm/io_apic.h> 7#include <asm/io_apic.h>
8#include <asm/smp.h> 8#include <asm/smp.h>
9#include <asm/cpu.h>
9#include <linux/intel-iommu.h> 10#include <linux/intel-iommu.h>
10#include "intr_remapping.h" 11#include "intr_remapping.h"
11 12