Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

x86: move this_cpu_offset 



Impact: Small cleanup

Define BOOT_PERCPU_OFFSET and use it for this_cpu_offset and
__per_cpu_offset initializers.

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

arch/x86/kernel/setup_percpu.c

+10 −5
Original line number Diff line number Diff line
@@ -25,15 +25,20 @@ 
DEFINE_PER_CPU(int, cpu_number);

EXPORT_PER_CPU_SYMBOL(cpu_number);



#ifdef CONFIG_X86_64

#define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)

#else

#define BOOT_PERCPU_OFFSET 0

#endif



DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;

EXPORT_PER_CPU_SYMBOL(this_cpu_off);



#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA



#ifdef CONFIG_X86_64

unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {

	[0] = (unsigned long)__per_cpu_load,

	[0] = BOOT_PERCPU_OFFSET,

};

#else

unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;

#endif

EXPORT_SYMBOL(__per_cpu_offset);



/*

arch/x86/kernel/smpcommon.c

+0 −7
Original line number Diff line number Diff line
@@ -5,13 +5,6 @@ 
#include <asm/smp.h>

#include <asm/sections.h>



#ifdef CONFIG_X86_64

DEFINE_PER_CPU(unsigned long, this_cpu_off) = (unsigned long)__per_cpu_load;

#else

DEFINE_PER_CPU(unsigned long, this_cpu_off);

#endif

EXPORT_PER_CPU_SYMBOL(this_cpu_off);



#ifdef CONFIG_X86_32

/*

 * Initialize the CPU's GDT.  This is either the boot CPU doing itself