summaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 11:53:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 11:53:42 -0700
commit5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f (patch)
tree799e309a7db032cb7abe9f0fa910c2989c3fdab5 /arch/frv
parent4d429480352c63db2228489f0db9fd381cdc3c9c (diff)
parent6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (diff)
downloadop-kernel-dev-5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f.zip
op-kernel-dev-5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f.tar.gz
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/frv')
-rw-r--r--arch/frv/kernel/vmlinux.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index 0daae8a..7e958d8 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -37,7 +37,7 @@ SECTIONS
_einittext = .;
INIT_DATA_SECTION(8)
- PERCPU(L1_CACHE_BYTES, 4096)
+ PERCPU_SECTION(L1_CACHE_BYTES)
. = ALIGN(PAGE_SIZE);
__init_end = .;
OpenPOWER on IntegriCloud