diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 14:53:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 14:53:42 -0400 |
| commit | 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f (patch) | |
| tree | 799e309a7db032cb7abe9f0fa910c2989c3fdab5 /arch/m32r | |
| parent | 4d429480352c63db2228489f0db9fd381cdc3c9c (diff) | |
| parent | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (diff) | |
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/m32r')
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index cf95aec77460..018e4a711d79 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
| @@ -54,7 +54,7 @@ SECTIONS | |||
| 54 | __init_begin = .; | 54 | __init_begin = .; |
| 55 | INIT_TEXT_SECTION(PAGE_SIZE) | 55 | INIT_TEXT_SECTION(PAGE_SIZE) |
| 56 | INIT_DATA_SECTION(16) | 56 | INIT_DATA_SECTION(16) |
| 57 | PERCPU(32, PAGE_SIZE) | 57 | PERCPU_SECTION(32) |
| 58 | . = ALIGN(PAGE_SIZE); | 58 | . = ALIGN(PAGE_SIZE); |
| 59 | __init_end = .; | 59 | __init_end = .; |
| 60 | /* freed after init ends here */ | 60 | /* freed after init ends here */ |