sparc: bury the sys_sigpause() remains (c9716252) · Commits · e / devices / android_kernel_fairphone_FP5

arch/sparc/kernel/signal_32.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -59,18 +59,13 @@ struct rt_signal_frame {
		#define SF_ALIGNEDSZ (((sizeof(struct signal_frame) + 7) & (~7)))
		#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame) + 7) & (~7)))

		static int _sigpause_common(old_sigset_t set)
		asmlinkage int sys_sigsuspend(old_sigset_t set)
		{
		sigset_t blocked;
		siginitset(&blocked, set);
		return sigsuspend(&blocked);
		}

		asmlinkage int sys_sigsuspend(old_sigset_t set)
		{
		return _sigpause_common(set);
		}

		asmlinkage void do_sigreturn(struct pt_regs *regs)
		{
		struct signal_frame __user *sf;

+1 −11

Original line number	Diff line number	Diff line
		@@ -236,23 +236,13 @@ struct rt_signal_frame {
		__siginfo_rwin_t *rwin_save;
		};

		static long _sigpause_common(old_sigset_t set)
		asmlinkage long sys_sigsuspend(old_sigset_t set)
		{
		sigset_t blocked;
		siginitset(&blocked, set);
		return sigsuspend(&blocked);
		}

		asmlinkage long sys_sigpause(unsigned int set)
		{
		return _sigpause_common(set);
		}

		asmlinkage long sys_sigsuspend(old_sigset_t set)
		{
		return _sigpause_common(set);
		}

		void do_rt_sigreturn(struct pt_regs *regs)
		{
		struct rt_signal_frame __user *sf;

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ extern asmlinkage long sys_rt_sigaction(int sig,

		extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
		extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
		extern asmlinkage long sys_sigpause(unsigned int set);
		extern asmlinkage long sys_sigsuspend(old_sigset_t set);
		extern void do_rt_sigreturn(struct pt_regs *regs);