diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
tree | 2320a92b1aed2c9475e291d75c92616af75e195a /arch/i386/kernel/vsyscall.lds.S | |
parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'arch/i386/kernel/vsyscall.lds.S')
-rw-r--r-- | arch/i386/kernel/vsyscall.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S index e26975fc68b6..f66cd11adb72 100644 --- a/arch/i386/kernel/vsyscall.lds.S +++ b/arch/i386/kernel/vsyscall.lds.S | |||
@@ -10,6 +10,7 @@ SECTIONS | |||
10 | . = VDSO_PRELINK + SIZEOF_HEADERS; | 10 | . = VDSO_PRELINK + SIZEOF_HEADERS; |
11 | 11 | ||
12 | .hash : { *(.hash) } :text | 12 | .hash : { *(.hash) } :text |
13 | .gnu.hash : { *(.gnu.hash) } | ||
13 | .dynsym : { *(.dynsym) } | 14 | .dynsym : { *(.dynsym) } |
14 | .dynstr : { *(.dynstr) } | 15 | .dynstr : { *(.dynstr) } |
15 | .gnu.version : { *(.gnu.version) } | 16 | .gnu.version : { *(.gnu.version) } |