diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /arch/ppc64/kernel/vdso32 | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ppc64/kernel/vdso32')
| -rw-r--r-- | arch/ppc64/kernel/vdso32/vdso32.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/vdso32/vdso32.lds.S b/arch/ppc64/kernel/vdso32/vdso32.lds.S index 11290c902ba3..6f87a916a394 100644 --- a/arch/ppc64/kernel/vdso32/vdso32.lds.S +++ b/arch/ppc64/kernel/vdso32/vdso32.lds.S | |||
| @@ -40,9 +40,9 @@ SECTIONS | |||
| 40 | .gcc_except_table : { *(.gcc_except_table) } | 40 | .gcc_except_table : { *(.gcc_except_table) } |
| 41 | .fixup : { *(.fixup) } | 41 | .fixup : { *(.fixup) } |
| 42 | 42 | ||
| 43 | .got ALIGN(4) : { *(.got.plt) *(.got) } | ||
| 44 | |||
| 45 | .dynamic : { *(.dynamic) } :text :dynamic | 43 | .dynamic : { *(.dynamic) } :text :dynamic |
| 44 | .got : { *(.got) } | ||
| 45 | .plt : { *(.plt) } | ||
| 46 | 46 | ||
| 47 | _end = .; | 47 | _end = .; |
| 48 | __end = .; | 48 | __end = .; |