From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 15:22:41 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
X-Git-Tag: v2.6.39-rc1~491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79d8a8f736151b12129984b1250fd708440e742c;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-2.6.39' of git://git./linux/kernel/git/tj/percpu

* 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support
  percpu: Generic support for this_cpu_cmpxchg_double()
  alpha: use L1_CACHE_BYTES for cacheline size in the linker script
  percpu: align percpu readmostly subsection to cacheline

Fix up trivial conflict in arch/x86/kernel/vmlinux.lds.S due to the
percpu alignment having changed ("x86: Reduce back the alignment of the
per-CPU data section")
---

79d8a8f736151b12129984b1250fd708440e742c
diff --cc arch/x86/kernel/vmlinux.lds.S
index 0381e1f,cef446f..101c323
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@@ -306,7 -305,7 +306,7 @@@ SECTION
  	}
  
  #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
- 	PERCPU(PAGE_SIZE)
 -	PERCPU(INTERNODE_CACHE_BYTES, THREAD_SIZE)
++	PERCPU(INTERNODE_CACHE_BYTES, PAGE_SIZE)
  #endif
  
  	. = ALIGN(PAGE_SIZE);