diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /arch/mn10300/kernel/vmlinux.lds.S | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into for-2.6.31
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 |