From db9f281626093e26a7c70edb4d50a3612e50a6dd Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Sat, 3 Sep 2005 15:56:35 -0700
Subject: [PATCH] --- yaml --- r: 6975 b: refs/heads/master c:
 2a0694d15d55d0deed928786a6393d5e45e37d76 h: refs/heads/master i:   6973:
 4ce6d5fee4891af13ab3e1292494e24efc7f45d9   6971:
 95da6a9b993a509ead7b91650511e00b5b624b60   6967:
 74f20089ae51db97142b686b2d3a25ebd2766c97   6959:
 30ac4513f73e4ce8eb73901e083712f48bf097db   6943:
 09f17c9105641e1a9a1f61f0e0d143a47b786576   6911:
 ff99ccfc407e501268d3e20485114d7230342f8c v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/i386/kernel/vsyscall-sigreturn.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index adfc7b147899..4f12d6f372f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56f1d5d52a21b93bc2984c920b17e0d80df5d1b2
+refs/heads/master: 2a0694d15d55d0deed928786a6393d5e45e37d76
diff --git a/trunk/arch/i386/kernel/vsyscall-sigreturn.S b/trunk/arch/i386/kernel/vsyscall-sigreturn.S
index c8fcf75b9be3..68afa50dd7cf 100644
--- a/trunk/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/trunk/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