diff options
| author | Linus Torvalds | 2011-05-24 20:53:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-24 20:53:42 +0200 |
| commit | 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f (patch) | |
| tree | 799e309a7db032cb7abe9f0fa910c2989c3fdab5 /arch/alpha | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 (diff) | |
| parent | Merge branch 'fixes-2.6.39' into for-2.6.40 (diff) | |
| download | kernel-qcow2-linux-5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f.tar.gz kernel-qcow2-linux-5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f.tar.xz kernel-qcow2-linux-5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f.zip | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Unify input section names
percpu: Avoid extra NOP in percpu_cmpxchg16b_double
percpu: Cast away printk format warning
percpu: Always align percpu output section to PAGE_SIZE
Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 3d890a98a08b..f937ad123852 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -39,7 +39,7 @@ SECTIONS __init_begin = ALIGN(PAGE_SIZE); INIT_TEXT_SECTION(PAGE_SIZE) INIT_DATA_SECTION(16) - PERCPU(L1_CACHE_BYTES, PAGE_SIZE) + PERCPU_SECTION(L1_CACHE_BYTES) /* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page needed for the THREAD_SIZE aligned init_task gets freed after init */ . = ALIGN(THREAD_SIZE); |