Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / powerpc / kernel / vdso32 / sigtramp.S

diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S
index e046427..cf0c9c9 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>
@@ -20,7 +19,7 @@
 
 /* The nop here is a hack.  The dwarf2 unwind routines subtract 1 from
    the return address to get an address in the middle of the presumed
-   call instruction.  Since we don't have a call here, we artifically
+   call instruction.  Since we don't have a call here, we artificially
    extend the range covered by the unwind info by adding a nop before
    the real start.  */
        nop
@@ -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 */