x86: smp.h move safe_smp_processor_id declartion to cpu.h
PATCH v2 2/4 x86: smp.h move safe_smp_processor_id declartion to cpu.h
Impact: cleanup, moving NON-SMP stuff from smp.h
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/include/asm/cpu.h | 1 + arch/x86/include/asm/smp.h | 1 - arch/x86/kernel/crash.c | 2 +- arch/x86/kernel/reboot.c | 1 + arch/x86/mach-voyager/setup.c | 1 + 5 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpu.h +1 -0
@@ -15,6 +15,7 @@ extern void prefill_possible_map(void);static inline void prefill_possible_map (void ) {} +#define safe_smp_processor_id () 0#define stack_smp_processor_id () 0#endif /* CONFIG_SMP */
arch/x86/include/asm/smp.h +0 -1
@@ -198,7 +198,6 @@ extern int safe_smp_processor_id(void);#else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */ #define cpu_physical_id (cpu) boot_cpu_physical_apicid -#define safe_smp_processor_id () 0#endif #ifdef CONFIG_X86_LOCAL_APIC
arch/x86/kernel/crash.c +1 -1
@@ -24,7 +24,7 @@#include <asm/apic.h> #include <asm/hpet.h> #include <linux/kdebug.h> -#include <asm/smp.h> +#include <asm/cpu.h> #include <asm/reboot.h> #include <asm/virtext.h>
arch/x86/kernel/reboot.c +1 -0
@@ -14,6 +14,7 @@#include <asm/reboot.h> #include <asm/pci_x86.h> #include <asm/virtext.h> +#include <asm/cpu.h> #ifdef CONFIG_X86_32 # include <linux/dmi.h>
arch/x86/mach-voyager/setup.c +1 -0
@@ -9,6 +9,7 @@#include <asm/e820.h> #include <asm/io.h> #include <asm/setup.h> +#include <asm/cpu.h> void __init pre_intr_init_hook (void ) {
Signature · 1 line
1.5.6.6