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

[linux-2.6-omap-h63xx.git] / arch / sparc64 / solaris / entry64.S

diff --git a/arch/sparc64/solaris/entry64.S b/arch/sparc64/solaris/entry64.S
index 4b6ae583c0a3ecdcd5ca8298c202501f14d764e0..f170324e8bf2447a3b51fce2cf7949f35d4fb1c1 100644 (file)
--- a/arch/sparc64/solaris/entry64.S
+++ b/arch/sparc64/solaris/entry64.S
@@ -180,6 +180,8 @@ solaris_sigsuspend:
         nop
        call            sys_sigsuspend
         stx            %o0, [%sp + PTREGS_OFF + PT_V9_I0]
+       b,pt            %xcc, ret_from_solaris
+        nop
 
        .globl          solaris_getpid
 solaris_getpid:
@@ -215,7 +217,7 @@ solaris_unimplemented:
        ba,pt           %xcc, ret_from_solaris
         nop
 
-       .section        __ex_table,#alloc
+       .section        __ex_table,"a"
        .align          4
        .word           exen, exenf