| commit | 79d8a8f736151b12129984b1250fd708440e742c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 16 Mar 2011 15:22:41 +0000 (16 08:22 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 16 Mar 2011 15:22:41 +0000 (16 08:22 -0700) | ||
| tree | f67eebe2bafca8820955ee9f851985a41fb32e66 | treesnapshot (tar.gz zip) |
| parent | bd2895eeade5f11f3e5906283c630bbdb4b57454 | commitdiff |
| parent | b9ec40af0e18fb7d02106be148036c2ea490fdf9 | commitdiff |
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")
* '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")