git.baikalelectronics.ru Git - kernel.git/commit

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

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Mar 2011 15:22:41 +0000 (08:22 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Mar 2011 15:22:41 +0000 (08:22 -0700)
commit	ae22752f35c688e25bc0c2a28453f1531b9bb603
tree	f67eebe2bafca8820955ee9f851985a41fb32e66	tree \| snapshot
parent	5804499b99c8ec54a790be8c88c462eaf84a9784	commit \| diff
parent	f8b49c8352e4f4f12e1a1396a4be415f87ae7533	commit \| diff

arch/arm/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/cris/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history