sparc32: fix sparse warnings in signal_32.c (529b17a9) · Commits · 戴 / test

Fix following warnings: signal_32.c:62:17: warning: symbol 'do_sigreturn' was not declared. Should it be static? signal_32.c:126:17: warning: symbol 'do_rt_sigreturn' was not declared. Should it be static? signal_32.c:344:39: warning: incorrect type in initializer (different address spaces) signal_32.c:344:39: expected struct __siginfo_fpu_t [usertype] *fp signal_32.c:344:39: got void [noderef] <asn:1>*[assigned] tail signal_32.c:346:45: warning: incorrect type in argument 2 (different address spaces) signal_32.c:346:45: expected struct __siginfo_fpu_t [noderef] [usertype] <asn:1>*fpu signal_32.c:346:45: got struct __siginfo_fpu_t [usertype] *fp signal_32.c:352:41: warning: incorrect type in initializer (different address spaces) signal_32.c:352:41: expected struct __siginfo_rwin_t [usertype] *rwp signal_32.c:352:41: got void [noderef] <asn:1>*[assigned] tail signal_32.c:354:48: warning: incorrect type in argument 2 (different address spaces) signal_32.c:354:48: expected struct __siginfo_rwin_t [noderef] [usertype] <asn:1>*rwin signal_32.c:354:48: got struct __siginfo_rwin_t [usertype] *rwp signal_32.c:509:6: warning: symbol 'do_notify_resume' was not declared. Should it be static? signal_32.c:520:16: warning: symbol 'do_sys_sigstack' was not declared. Should it be static? Add missing prototypes and annotate two variables with __user. Signed-off-by:

Sam Ravnborg <sam@ravnborg.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

arch/sparc/kernel/kernel.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,14 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
		struct pt_regs *regs,
		unsigned long stack_size);

		/* signal_32.c */
		asmlinkage void do_sigreturn(struct pt_regs *regs);
		asmlinkage void do_rt_sigreturn(struct pt_regs *regs);
		void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
		unsigned long thread_info_flags);
		asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,
		struct sigstack __user *ossptr,
		unsigned long sp);
		#else /* CONFIG_SPARC32 */
		#endif /* CONFIG_SPARC32 */
		#endif /* !(__SPARC_KERNEL_H) */

arch/sparc/kernel/signal_32.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <asm/switch_to.h>

		#include "sigutil.h"
		#include "kernel.h"

		extern void fpsave(unsigned long fpregs, unsigned long fsr,
		void fpqueue, unsigned long fpqdepth);
		@@ -341,7 +342,7 @@ static int setup_rt_frame(struct ksignal ksig, struct pt_regs regs,
		err \|= __put_user(0, &sf->extra_size);

		if (psr & PSR_EF) {
		__siginfo_fpu_t *fp = tail;
		__siginfo_fpu_t __user *fp = tail;
		tail += sizeof(*fp);
		err \|= save_fpu_state(regs, fp);
		err \|= __put_user(fp, &sf->fpu_save);
		@@ -349,7 +350,7 @@ static int setup_rt_frame(struct ksignal ksig, struct pt_regs regs,
		err \|= __put_user(0, &sf->fpu_save);
		}
		if (wsaved) {
		__siginfo_rwin_t *rwp = tail;
		__siginfo_rwin_t __user *rwp = tail;
		tail += sizeof(*rwp);
		err \|= save_rwin_state(wsaved, rwp);
		err \|= __put_user(rwp, &sf->rwin_save);
		@@ -517,8 +518,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
		}
		}

		asmlinkage int
		do_sys_sigstack(struct sigstack __user ssptr, struct sigstack __user ossptr,
		asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,
		struct sigstack __user *ossptr,
		unsigned long sp)
		{
		int ret = -EFAULT;

Admin message