diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
| commit | 02cee68998010c4a2cc2383c86babc2ecc737183 (patch) | |
| tree | 13c6483472f672c3b2570b075ed2ad4fd4c5405e /arch/powerpc/kernel/vdso32/vdso32.lds.S | |
| parent | f5ba35023697e54a24487bcd822194390a333893 (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
Merge commit 'v2.6.32-rc6' into next
Diffstat (limited to 'arch/powerpc/kernel/vdso32/vdso32.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S index 904ef1360dd7..0546bcd49cd0 100644 --- a/arch/powerpc/kernel/vdso32/vdso32.lds.S +++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S | |||
| @@ -25,7 +25,7 @@ SECTIONS | |||
| 25 | . = ALIGN(16); | 25 | . = ALIGN(16); |
| 26 | .text : { | 26 | .text : { |
| 27 | *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*) | 27 | *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*) |
| 28 | } | 28 | } :text |
| 29 | PROVIDE(__etext = .); | 29 | PROVIDE(__etext = .); |
| 30 | PROVIDE(_etext = .); | 30 | PROVIDE(_etext = .); |
| 31 | PROVIDE(etext = .); | 31 | PROVIDE(etext = .); |
| @@ -56,7 +56,7 @@ SECTIONS | |||
| 56 | .fixup : { *(.fixup) } | 56 | .fixup : { *(.fixup) } |
| 57 | 57 | ||
| 58 | .dynamic : { *(.dynamic) } :text :dynamic | 58 | .dynamic : { *(.dynamic) } :text :dynamic |
| 59 | .got : { *(.got) } | 59 | .got : { *(.got) } :text |
| 60 | .plt : { *(.plt) } | 60 | .plt : { *(.plt) } |
| 61 | 61 | ||
| 62 | _end = .; | 62 | _end = .; |