summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2005-09-03 15:56:35 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:06:10 -0700
commit2a0694d15d55d0deed928786a6393d5e45e37d76 (patch)
tree50b408c01b57b3d77069dc0e3bc1da42423174d3 /arch/i386
parent56f1d5d52a21b93bc2984c920b17e0d80df5d1b2 (diff)
downloadkernel-crypto-2a0694d15d55d0deed928786a6393d5e45e37d76.tar.gz
kernel-crypto-2a0694d15d55d0deed928786a6393d5e45e37d76.tar.xz
kernel-crypto-2a0694d15d55d0deed928786a6393d5e45e37d76.zip
[PATCH] i386: clean up vDSO alignment padding
This makes the vDSO use nops for all its padding around instructions, rather than sometimes zeros, and nop-pads the end of the area containing instructions to a 32-byte cache line, to keep text and data in separate lines. Signed-off-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/vsyscall-sigreturn.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S
index c8fcf75b9be..68afa50dd7c 100644
--- a/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/arch/i386/kernel/vsyscall-sigreturn.S
@@ -15,7 +15,7 @@
*/
.text
- .org __kernel_vsyscall+32
+ .org __kernel_vsyscall+32,0x90
.globl __kernel_sigreturn
.type __kernel_sigreturn,@function
__kernel_sigreturn:
@@ -35,6 +35,7 @@ __kernel_rt_sigreturn:
int $0x80
.LEND_rt_sigreturn:
.size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn
+ .balign 32
.previous
.section .eh_frame,"a",@progbits