Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / vsyscall-sigreturn.S

diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S
index 68afa50dd7cf79bf0d5eb021115c59e03fee692f..a92262f4165993fbd76266ccdc798bb7c7d60355 100644 (file)
--- a/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/arch/i386/kernel/vsyscall-sigreturn.S
@@ -7,7 +7,7 @@
  */
 
 #include <asm/unistd.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 
 /* XXX
@@ -44,7 +44,7 @@ __kernel_rt_sigreturn:
 .LSTARTCIEDLSI1:
        .long 0                 /* CIE ID */
        .byte 1                 /* Version number */
-       .string "zR"            /* NUL-terminated augmentation string */
+       .string "zRS"           /* NUL-terminated augmentation string */
        .uleb128 1              /* Code alignment factor */
        .sleb128 -4             /* Data alignment factor */
        .byte 8                 /* Return address register column */