Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzill...

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / vdso32 / sigtramp.S

diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S
index e04642781917b2be3742388e6cbc1c608e8fb842..68d49dd71dccfb8b2f1813b6576d7df60736479b 100644 (file)
--- a/arch/powerpc/kernel/vdso32/sigtramp.S
+++ b/arch/powerpc/kernel/vdso32/sigtramp.S
@@ -10,7 +10,6 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/unistd.h>
@@ -261,7 +260,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt32)
 .Lcie_start:
        .long 0                 /* CIE ID */
        .byte 1                 /* Version number */
-       .string "zR"            /* NUL-terminated augmentation string */
+       .string "zRS"           /* NUL-terminated augmentation string */
        .uleb128 4              /* Code alignment factor */
        .sleb128 -4             /* Data alignment factor */
        .byte 67                /* Return address register column, ap */