Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/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")

diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/cris/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/include/asm/percpu.h
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
index 0381e1f3baed0dbfd5215c3e82ac767747796012,cef446f8ac78a0c57e6f489c7a7b7b3e68fe0047..101c32309f17b62906b503313a4cb19a1459fac5
--- 1/arch/x86/kernel/vmlinux.lds.S
--- 2/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);

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge