alpha: fix compile problem in arch/alpha/kernel/signal.c

torvalds · torvalds · commit 0f44fbd297e1 · 2010-09-28T13:26:57.000-07:00
Tssk. Apparently Al hadn't checked commit c52c2dd ("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>
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ SYSCALL_DEFINE2(osf_sigprocmask, int, how, unsigned long, newmask)`
`49`	`49`	`unsigned long res;`
`50`	`50`
`51`	`51`	`siginitset(&mask, newmask & ~_BLOCKABLE);`
`52`		`- res = siprocmask(how, &mask, &oldmask);`
	`52`	`+ res = sigprocmask(how, &mask, &oldmask);`
`53`	`53`	`if (!res) {`
`54`	`54`	`force_successful_syscall_return();`
`55`		`- res = oldmask->sig[0];`
	`55`	`+ res = oldmask.sig[0];`
`56`	`56`	`}`
`57`	`57`	`return res;`
`58`	`58`	`}`