aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2005-04-28 22:47:29 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-28 22:47:29 -0700
commitc60c390620e0abb60d4ae8c43583714bda27763f (patch)
tree11aaf9d3ebfd4998fc7d550c9af4f502105f0835 /arch/x86_64
parent[PATCH] cifs: Do not sleep interruptible after socket connect failure (diff)
downloadlinux-dev-c60c390620e0abb60d4ae8c43583714bda27763f.tar.xz
linux-dev-c60c390620e0abb60d4ae8c43583714bda27763f.zip
[PATCH] x86_64: fix PT_NOTE addition to IA32 vDSO
The addition of the PT_NOTE didn't take in the x86_64 version of the i386 vDSO, because I forgot the linker script bit in that copy. Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/ia32/vsyscall.lds2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/ia32/vsyscall.lds b/arch/x86_64/ia32/vsyscall.lds
index fa4b4dd4a9ff..f2e75ed4c6c7 100644
--- a/arch/x86_64/ia32/vsyscall.lds
+++ b/arch/x86_64/ia32/vsyscall.lds
@@ -36,6 +36,7 @@ SECTIONS
.text.rtsigreturn : { *(.text.rtsigreturn) } :text =0x90909090
+ .note : { *(.note.*) } :text :note
.eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
.eh_frame : { KEEP (*(.eh_frame)) } :text
.dynamic : { *(.dynamic) } :text :dynamic
@@ -55,6 +56,7 @@ PHDRS
{
text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
+ note PT_NOTE FLAGS(4); /* PF_R */
eh_frame_hdr 0x6474e550; /* PT_GNU_EH_FRAME, but ld doesn't match the name */
}