Merge v2.6.37-rc8 into powerpc/next

[pandora-kernel.git] / arch / alpha / kernel / signal.c

diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 779780a..6f7feb5 100644 (file)
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -48,11 +48,11 @@ SYSCALL_DEFINE2(osf_sigprocmask, int, how, unsigned long, newmask)
        sigset_t mask;
        unsigned long res;
 
-       siginitset(&mask, newmask & ~_BLOCKABLE);
-       res = siprocmask(how, &mask, &oldmask);
+       siginitset(&mask, newmask & _BLOCKABLE);
+       res = sigprocmask(how, &mask, &oldmask);
        if (!res) {
                force_successful_syscall_return();
-               res = oldmask->sig[0];
+               res = oldmask.sig[0];
        }
        return res;
 }