From e839e4979370a5efb97a8fc2b2b18b755c1acf7c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 25 Dec 2012 15:01:55 -0500
Subject: [PATCH] --- yaml --- r: 356665 b: refs/heads/master c:
 67cf48fe2529576bc38ab2b3be929d37d799ac91 h: refs/heads/master i:   356663:
 e94899193136526329c9751a7604b928e3623f78 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm64/Kconfig           |  1 +
 trunk/arch/arm64/kernel/signal32.c | 18 ------------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 822e3a887dc4..5d54b435bbd2 100644
--- 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
index 4b99d632329e..6f056d7d3c62 100644
--- 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
index dcc13bd94fb0..39240d8e7aab 100644
--- 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)
 {