diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 16:32:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 16:32:51 +1000 |
| commit | b0a7f0e16dd88000115ae7448c936ac78e1fc8c3 (patch) | |
| tree | c218ea9723f8e188f9b82f50299dae167de34e13 /arch/um | |
| parent | 9072f428eda1c472d8a6c2c89500666e9040a59c (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
Merge commit 'percpu/for-next'
Conflicts:
arch/sh/kernel/vmlinux.lds.S
kernel/sched.c
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 5 | ||||
| -rw-r--r-- | arch/um/kernel/dyn.lds.S | 2 | ||||
| -rw-r--r-- | arch/um/kernel/uml.lds.S | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index cb0248616d49..37ecc5577a9a 100644 --- a/arch/um/include/asm/common.lds.S +++ b/arch/um/include/asm/common.lds.S @@ -123,8 +123,3 @@ __initramfs_end = .; } - /* Sections to be discarded */ - /DISCARD/ : { - *(.exitcall.exit) - } - diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 9975e1ab44fb..715a188c0472 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S @@ -156,4 +156,6 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + + DISCARDS } diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index 11b835248b86..2ebd39765db8 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S @@ -100,4 +100,6 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + + DISCARDS } |