---

yaml --- r: 356665 b: refs/heads/master c: 67cf48f h: refs/heads/master i: 356663: e948991 v: v3
git-mirror · Feb 14, 2013 · e839e49 · e839e49
1 parent 7a4a965
commit e839e49
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 630cfbbbe656fb0377a6847606016d88cef7675a
+refs/heads/master: 67cf48fe2529576bc38ab2b3be929d37d799ac91
diff --git a/trunk/arch/arm64/Kconfig b/trunk/arch/arm64/Kconfig
@@ -6,6 +6,7 @@ config ARM64
 	select CLONE_BACKWARDS
 	select COMMON_CLK
 	select GENERIC_CLOCKEVENTS
+	select GENERIC_COMPAT_RT_SIGPENDING
 	select GENERIC_COMPAT_RT_SIGPROCMASK
 	select GENERIC_HARDIRQS_NO_DEPRECATED
 	select GENERIC_IOMAP

diff --git a/trunk/arch/arm64/kernel/signal32.c b/trunk/arch/arm64/kernel/signal32.c
@@ -693,24 +693,6 @@ int compat_setup_frame(int usig, struct k_sigaction *ka, sigset_t *set,
 	return err;
 }
 
-asmlinkage int compat_sys_rt_sigpending(compat_sigset_t __user *set,
-					compat_size_t sigsetsize)
-{
-	sigset_t s;
-	int ret;
-	mm_segment_t old_fs = get_fs();
-
-	set_fs(KERNEL_DS);
-	/* The __user pointer cast is valid because of the set_fs() */
-	ret = sys_rt_sigpending((sigset_t __user *) &s, sigsetsize);
-	set_fs(old_fs);
-	if (!ret) {
-		if (put_sigset_t(set, &s))
-			return -EFAULT;
-	}
-	return ret;
-}
-
 asmlinkage int compat_sys_rt_sigqueueinfo(int pid, int sig,
 					  compat_siginfo_t __user *uinfo)
 {