From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 5 Sep 2008 07:24:30 +0000 (+0200)
Subject: Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3d0ba7b8fb8f57c33207adcb41f40c176148c03;p=linux-2.6-omap-h63xx.git

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>
---

d3d0ba7b8fb8f57c33207adcb41f40c176148c03
diff --cc arch/x86/kernel/cpu/common.c
index 008c73796bb,b2f54fafb8b..7d5a07f0fd2
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -22,9 -21,7 +22,9 @@@
  
  #include "cpu.h"
  
 +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 } } },
diff --cc include/asm-generic/vmlinux.lds.h
index cb752ba7246,69e5c1182fd..7440a0dcedd
--- a/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)				\
  	}								\