From: Tejun Heo <tj@kernel.org>
Date: Tue, 24 May 2011 07:59:36 +0000 (+0200)
Subject: Merge branch 'fixes-2.6.39' into for-2.6.40
X-Git-Tag: firefly_0821_release~7613^2~1305^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes-2.6.39' into for-2.6.40
---

6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0
diff --cc include/asm-generic/vmlinux.lds.h
index f301cea5ca2d,bf90fbc6688b..ebdaafa866a7
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -740,20 -754,11 +753,11 @@@
   * except that __per_cpu_load is defined as a relative symbol against
   * .data..percpu which is required for relocatable x86_32 configuration.
   */
 -#define PERCPU(cacheline, align)					\
 -	. = ALIGN(align);						\
 +#define PERCPU_SECTION(cacheline)					\
 +	. = ALIGN(PAGE_SIZE);						\
  	.data..percpu	: AT(ADDR(.data..percpu) - LOAD_OFFSET) {	\
  		VMLINUX_SYMBOL(__per_cpu_load) = .;			\
- 		VMLINUX_SYMBOL(__per_cpu_start) = .;			\
- 		*(.data..percpu..first)					\
- 		. = ALIGN(PAGE_SIZE);					\
- 		*(.data..percpu..page_aligned)				\
- 		. = ALIGN(cacheline);					\
- 		*(.data..percpu..readmostly)				\
- 		. = ALIGN(cacheline);					\
- 		*(.data..percpu)					\
- 		*(.data..percpu..shared_aligned)			\
- 		VMLINUX_SYMBOL(__per_cpu_end) = .;			\
+ 		PERCPU_INPUT(cacheline)					\
  	}