Commit 2f4dfe20 authored by Fernando Luis Vazquez Cao's avatar Fernando Luis Vazquez Cao Committed by Linus Torvalds
Browse files

Remove hardcoding of hard_smp_processor_id on UP systems 



With the advent of kdump, the assumption that the boot CPU when booting an UP
kernel is always the CPU with a particular hardware ID (often 0) (usually
referred to as BSP on some architectures) is not valid anymore.  The reason
being that the dump capture kernel boots on the crashed CPU (the CPU that
invoked crash_kexec), which may be or may not be that particular CPU.

Move definition of hard_smp_processor_id for the UP case to
architecture-specific code ("asm/smp.h") where it belongs, so that each
architecture can provide its own implementation.

Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Acked-by: default avatarAndi Kleen <ak@suse.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd2a345f

arch/sparc64/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/init.h>

#include <linux/kdebug.h>



#include <asm/smp.h>

#include <asm/delay.h>

#include <asm/system.h>

#include <asm/ptrace.h>

include/asm-alpha/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, in 


#else /* CONFIG_SMP */



#define hard_smp_processor_id()		0

#define smp_call_function_on_cpu(func,info,retry,wait,cpu)    ({ 0; })



#endif /* CONFIG_SMP */

include/asm-i386/smp.h

+2 −1
Original line number Diff line number Diff line
@@ -147,12 +147,13 @@ extern unsigned int num_processors; 


#else /* CONFIG_SMP */



#define hard_smp_processor_id()		0

#define safe_smp_processor_id()		0

#define cpu_physical_id(cpu)		boot_cpu_physical_apicid



#define NO_PROC_ID		0xFF		/* No processor magic marker */



#endif

#endif /* CONFIG_SMP */



#ifndef __ASSEMBLY__

include/asm-ia64/smp.h

+2 −1
Original line number Diff line number Diff line
@@ -128,8 +128,9 @@ extern void unlock_ipi_calllock(void); 
extern void identify_siblings (struct cpuinfo_ia64 *);

extern int is_multithreading_enabled(void);



#else

#else /* CONFIG_SMP */



#define hard_smp_processor_id()		0

#define cpu_logical_id(i)		0

#define cpu_physical_id(i)		ia64_get_lid()

include/asm-m32r/smp.h

+5 −1
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ extern unsigned long send_IPI_mask_phys(cpumask_t, int, int); 
#define IPI_SHIFT	(0)

#define NR_IPIS		(8)



#else	/* CONFIG_SMP */



#define hard_smp_processor_id()		0



#endif /* CONFIG_SMP */



#endif	/* _ASM_M32R_SMP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE