diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 11:22:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 11:22:41 -0400 |
| commit | 79d8a8f736151b12129984b1250fd708440e742c (patch) | |
| tree | f67eebe2bafca8820955ee9f851985a41fb32e66 /arch/frv/kernel | |
| parent | bd2895eeade5f11f3e5906283c630bbdb4b57454 (diff) | |
| parent | b9ec40af0e18fb7d02106be148036c2ea490fdf9 (diff) | |
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")
Diffstat (limited to 'arch/frv/kernel')
| -rw-r--r-- | arch/frv/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index 8b973f3cc90e..0daae8af5787 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
| @@ -37,7 +37,7 @@ SECTIONS | |||
| 37 | _einittext = .; | 37 | _einittext = .; |
| 38 | 38 | ||
| 39 | INIT_DATA_SECTION(8) | 39 | INIT_DATA_SECTION(8) |
| 40 | PERCPU(4096) | 40 | PERCPU(L1_CACHE_BYTES, 4096) |
| 41 | 41 | ||
| 42 | . = ALIGN(PAGE_SIZE); | 42 | . = ALIGN(PAGE_SIZE); |
| 43 | __init_end = .; | 43 | __init_end = .; |