Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Linus Torvalds [Wed, 16 Mar 2011 15:22:41 +0000 (08:22 -0700)]
* '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")

1  2 
arch/arm/kernel/vmlinux.lds.S
arch/cris/kernel/vmlinux.lds.S
arch/x86/include/asm/percpu.h
arch/x86/kernel/vmlinux.lds.S
include/asm-generic/vmlinux.lds.h

Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge