diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/arm/kernel/vmlinux.lds.S | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 39d3ffb9ff2b..aecf87dfbaec 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -83,6 +83,7 @@ SECTIONS | |||
| 83 | EXIT_TEXT | 83 | EXIT_TEXT |
| 84 | EXIT_DATA | 84 | EXIT_DATA |
| 85 | *(.exitcall.exit) | 85 | *(.exitcall.exit) |
| 86 | *(.discard) | ||
| 86 | *(.ARM.exidx.exit.text) | 87 | *(.ARM.exidx.exit.text) |
| 87 | *(.ARM.extab.exit.text) | 88 | *(.ARM.extab.exit.text) |
| 88 | #ifndef CONFIG_HOTPLUG_CPU | 89 | #ifndef CONFIG_HOTPLUG_CPU |