Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':

  "percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"

into x86/core

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/cpu/common.c
index 008c737,b2f54fa..7d5a07f
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -22,9 -21,7 +22,9 @@@
  
  #include "cpu.h"
  
- DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {
 +static struct cpu_dev *this_cpu __cpuinitdata;
 +
+ 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 } } },

diff --cc arch/x86/kernel/vmlinux_32.lds.S
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
index cb752ba,69e5c11..7440a0d
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -383,8 -346,9 +383,9 @@@
  
  #define PERCPU(align)                                                 \
        . = ALIGN(align);                                               \
 -      __per_cpu_start = .;                                            \
 +      VMLINUX_SYMBOL(__per_cpu_start) = .;                            \
        .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {          \
+               *(.data.percpu.page_aligned)                            \
                *(.data.percpu)                                         \
                *(.data.percpu.shared_aligned)                          \
        }                                                               \

diff --cc include/linux/percpu.h
Simple merge