diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /arch/mn10300/kernel/vmlinux.lds.S | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index b8259668f7dc..24de6b90f401 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
| @@ -27,10 +27,7 @@ SECTIONS | |||
| 27 | _stext = .; | 27 | _stext = .; |
| 28 | _text = .; /* Text and read-only data */ | 28 | _text = .; /* Text and read-only data */ |
| 29 | .text : { | 29 | .text : { |
| 30 | *( | 30 | HEAD_TEXT |
| 31 | .text.head | ||
| 32 | .text | ||
| 33 | ) | ||
| 34 | TEXT_TEXT | 31 | TEXT_TEXT |
| 35 | SCHED_TEXT | 32 | SCHED_TEXT |
| 36 | LOCK_TEXT | 33 | LOCK_TEXT |