aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 13:26:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 13:26:57 -0700
commit0f44fbd297e1cda5d9ecc9f5321a86fe647c7d4a (patch)
tree9f3bd3eb11181cd3874bdd2a66361765522337b4
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
downloadlinux-dev-0f44fbd297e1cda5d9ecc9f5321a86fe647c7d4a.tar.xz
linux-dev-0f44fbd297e1cda5d9ecc9f5321a86fe647c7d4a.zip
alpha: fix compile problem in arch/alpha/kernel/signal.c
Tssk. Apparently Al hadn't checked commit c52c2ddc1dfa ("alpha: switch osf_sigprocmask() to use of sigprocmask()") at all. It doesn't compile. Fixed as per suggestions from Michael Cree. Reported-by: Michael Cree <mcree@orcon.net.nz> Cc: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/alpha/kernel/signal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 779780a332d3..d290845aef59 100644
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -49,10 +49,10 @@ SYSCALL_DEFINE2(osf_sigprocmask, int, how, unsigned long, newmask)
unsigned long res;
siginitset(&mask, newmask & ~_BLOCKABLE);
- res = siprocmask(how, &mask, &oldmask);
+ res = sigprocmask(how, &mask, &oldmask);
if (!res) {
force_successful_syscall_return();
- res = oldmask->sig[0];
+ res = oldmask.sig[0];
}
return res;
}