Commit ea927906 authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

x86-64: Move cpu number from PDA to per-cpu and consolidate with 32-bit. 



tj: moved cpu_number definition out of CONFIG_HAVE_SETUP_PER_CPU_AREA
    for voyager.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 92d65b23

arch/x86/include/asm/pda.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct x8664_pda { 
	unsigned long kernelstack;	/* 16 top of kernel stack for current */

	unsigned long oldrsp;		/* 24 user rsp for system call */

	int irqcount;			/* 32 Irq nesting counter. Starts -1 */

	unsigned int cpunumber;		/* 36 Logical CPU number */

	unsigned int unused6;		/* 36 was cpunumber */

#ifdef CONFIG_CC_STACKPROTECTOR

	unsigned long stack_canary;	/* 40 stack canary value */

					/* gcc-ABI: this canary MUST be at

arch/x86/include/asm/smp.h

+1 −3
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ extern unsigned int num_processors; 
DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u16, cpu_llc_id);

#ifdef CONFIG_X86_32

DECLARE_PER_CPU(int, cpu_number);

#endif



static inline struct cpumask *cpu_sibling_mask(int cpu)

{
@@ -164,7 +162,7 @@ extern unsigned disabled_cpus __cpuinitdata; 
extern int safe_smp_processor_id(void);



#elif defined(CONFIG_X86_64_SMP)

#define raw_smp_processor_id()	read_pda(cpunumber)

#define raw_smp_processor_id() (percpu_read(cpu_number))



#define stack_smp_processor_id()					\

({								\

arch/x86/kernel/asm-offsets_64.c

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ int main(void) 
	ENTRY(oldrsp); 

	ENTRY(pcurrent); 

	ENTRY(irqcount);

	ENTRY(cpunumber);

	DEFINE(pda_size, sizeof(struct x8664_pda));

	BLANK();

#undef ENTRY

arch/x86/kernel/cpu/common.c

+0 −1
Original line number Diff line number Diff line
@@ -899,7 +899,6 @@ void __cpuinit pda_init(int cpu) 


	load_pda_offset(cpu);



	pda->cpunumber = cpu;

	pda->irqcount = -1;

	pda->kernelstack = (unsigned long)stack_thread_info() -

				 PDA_STACKOFFSET + THREAD_SIZE;

arch/x86/kernel/process_32.c

+0 −3
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); 
DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;

EXPORT_PER_CPU_SYMBOL(current_task);



DEFINE_PER_CPU(int, cpu_number);

EXPORT_PER_CPU_SYMBOL(cpu_number);



/*

 * Return saved PC of a blocked thread.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE