aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2011-03-17 14:14:12 -0400
committerChris Metcalf <cmetcalf@tilera.com>2011-03-17 14:14:12 -0400
commit325d1605542960903c88409b199734a3d8fc6612 (patch)
tree9d8eeed393a3b5dcadd1ddb6b76634b464fd6bc7 /arch/cris/kernel/vmlinux.lds.S
parentarch/tile: fix deadlock bugs in rwlock implementation (diff)
parentLinux 2.6.38 (diff)
downloadlinux-dev-325d1605542960903c88409b199734a3d8fc6612.tar.xz
linux-dev-325d1605542960903c88409b199734a3d8fc6612.zip
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/cris/kernel/vmlinux.lds.S')
-rw-r--r--arch/cris/kernel/vmlinux.lds.S5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index 442218980db0..c49be845f96a 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -72,11 +72,6 @@ SECTIONS
INIT_TEXT_SECTION(PAGE_SIZE)
.init.data : { INIT_DATA }
.init.setup : { INIT_SETUP(16) }
-#ifdef CONFIG_ETRAX_ARCH_V32
- __start___param = .;
- __param : { *(__param) }
- __stop___param = .;
-#endif
.initcall.init : {
INIT_CALLS
}