sparc: switch to generic compat rt_sigprocmask(2) (826c8772) · Commits · e / devices / android_kernel_fairphone_FP5

arch/sparc/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ config SPARC
		select MODULES_USE_ELF_RELA
		select ODD_RT_SIGACTION
		select GENERIC_SIGALTSTACK
		select GENERIC_COMPAT_RT_SIGPROCMASK

		config SPARC32
		def_bool !64BIT

+0 −40

Original line number	Diff line number	Diff line
		@@ -211,46 +211,6 @@ asmlinkage long compat_sys_sysfs(int option, u32 arg1, u32 arg2)
		return sys_sysfs(option, arg1, arg2);
		}

		asmlinkage long compat_sys_rt_sigprocmask(int how,
		compat_sigset_t __user *set,
		compat_sigset_t __user *oset,
		compat_size_t sigsetsize)
		{
		sigset_t s;
		compat_sigset_t s32;
		int ret;
		mm_segment_t old_fs = get_fs();

		if (set) {
		if (copy_from_user (&s32, set, sizeof(compat_sigset_t)))
		return -EFAULT;
		switch (_NSIG_WORDS) {
		case 4: s.sig[3] = s32.sig[6] \| (((long)s32.sig[7]) << 32);
		case 3: s.sig[2] = s32.sig[4] \| (((long)s32.sig[5]) << 32);
		case 2: s.sig[1] = s32.sig[2] \| (((long)s32.sig[3]) << 32);
		case 1: s.sig[0] = s32.sig[0] \| (((long)s32.sig[1]) << 32);
		}
		}
		set_fs (KERNEL_DS);
		ret = sys_rt_sigprocmask(how,
		set ? (sigset_t __user *) &s : NULL,
		oset ? (sigset_t __user *) &s : NULL,
		sigsetsize);
		set_fs (old_fs);
		if (ret) return ret;
		if (oset) {
		switch (_NSIG_WORDS) {
		case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];
		case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];
		case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];
		case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];
		}
		if (copy_to_user (oset, &s32, sizeof(compat_sigset_t)))
		return -EFAULT;
		}
		return 0;
		}

		asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
		compat_size_t sigsetsize)
		{