Commit d3d0ba7b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit '63cc8c75': 



  "percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"

into x86/core

Conflicts:
	arch/x86/kernel/cpu/common.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 90427638 63cc8c75

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


static struct cpu_dev *this_cpu __cpuinitdata;



DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {

DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {

	[GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } },

	[GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } },

	[GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } },

arch/x86/kernel/vmlinux_32.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ SECTIONS 
  . = ALIGN(PAGE_SIZE);

  .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {

	__per_cpu_start = .;

	*(.data.percpu.page_aligned)

	*(.data.percpu)

	*(.data.percpu.shared_aligned)

	__per_cpu_end = .;

include/asm-generic/vmlinux.lds.h

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ 
	. = ALIGN(align);						\

	VMLINUX_SYMBOL(__per_cpu_start) = .;				\

	.data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {		\

		*(.data.percpu.page_aligned)				\

		*(.data.percpu)						\

		*(.data.percpu.shared_aligned)				\

	}								\

include/linux/percpu.h

+7 −0
Original line number Diff line number Diff line
@@ -23,12 +23,19 @@ 
	__attribute__((__section__(SHARED_ALIGNED_SECTION)))		\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name		\

	____cacheline_aligned_in_smp



#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)			\

	__attribute__((__section__(".data.percpu.page_aligned")))	\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name

#else

#define DEFINE_PER_CPU(type, name)					\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name



#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)		      \

	DEFINE_PER_CPU(type, name)



#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)		      \

	DEFINE_PER_CPU(type, name)

#endif



#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)