瀏覽代碼

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

Impact: cleanup

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Jaswinder Singh Rajput 17 年之前
父節點
當前提交
96b89dc659
共有 5 個文件被更改,包括 4 次插入2 次删除
  1. 1 0
      arch/x86/include/asm/cpu.h
  2. 0 1
      arch/x86/include/asm/smp.h
  3. 1 1
      arch/x86/kernel/crash.c
  4. 1 0
      arch/x86/kernel/reboot.c
  5. 1 0
      arch/x86/mach-voyager/setup.c

+ 1 - 0
arch/x86/include/asm/cpu.h

@@ -15,6 +15,7 @@ extern void prefill_possible_map(void);
 
 
 static inline void prefill_possible_map(void) {}
 static inline void prefill_possible_map(void) {}
 
 
+#define safe_smp_processor_id()			0
 #define stack_smp_processor_id()		0
 #define stack_smp_processor_id()		0
 
 
 #endif /* CONFIG_SMP */
 #endif /* CONFIG_SMP */

+ 0 - 1
arch/x86/include/asm/smp.h

@@ -172,7 +172,6 @@ extern int safe_smp_processor_id(void);
 
 
 #else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */
 #else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */
 #define cpu_physical_id(cpu)		boot_cpu_physical_apicid
 #define cpu_physical_id(cpu)		boot_cpu_physical_apicid
-#define safe_smp_processor_id()		0
 #endif
 #endif
 
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #ifdef CONFIG_X86_LOCAL_APIC

+ 1 - 1
arch/x86/kernel/crash.c

@@ -24,7 +24,7 @@
 #include <asm/apic.h>
 #include <asm/apic.h>
 #include <asm/hpet.h>
 #include <asm/hpet.h>
 #include <linux/kdebug.h>
 #include <linux/kdebug.h>
-#include <asm/smp.h>
+#include <asm/cpu.h>
 #include <asm/reboot.h>
 #include <asm/reboot.h>
 #include <asm/virtext.h>
 #include <asm/virtext.h>
 
 

+ 1 - 0
arch/x86/kernel/reboot.c

@@ -14,6 +14,7 @@
 #include <asm/reboot.h>
 #include <asm/reboot.h>
 #include <asm/pci_x86.h>
 #include <asm/pci_x86.h>
 #include <asm/virtext.h>
 #include <asm/virtext.h>
+#include <asm/cpu.h>
 
 
 #ifdef CONFIG_X86_32
 #ifdef CONFIG_X86_32
 # include <linux/dmi.h>
 # include <linux/dmi.h>

+ 1 - 0
arch/x86/mach-voyager/setup.c

@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/e820.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/setup.h>
+#include <asm/cpu.h>
 
 
 void __init pre_intr_init_hook(void)
 void __init pre_intr_init_hook(void)
 {
 {