From a4f1f1abec39b0429f681817f200007d4fa14e99 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Apr 2008 00:53:06 -0700
Subject: [PATCH] --- yaml --- r: 95143 b: refs/heads/master c:
 4e4c22c71144c1b2e22c257ec6cf08ccb5be1165 h: refs/heads/master i:   95141:
 826a5b476bf927aefc8dbe90736cea9a2ec38695   95139:
 f3cb8d84949f3aa94daa328b9e6aac1f7521a4d7   95135:
 3c51f926516f3e4d2930c9d7c67390f802d05a61 v: v3

---
 [refs]                            |  2 +-
 trunk/fs/compat.c                 |  6 +++---
 trunk/fs/eventpoll.c              |  3 +--
 trunk/fs/select.c                 |  4 ++--
 trunk/include/linux/thread_info.h | 15 ++++++++++++++-
 trunk/kernel/compat.c             |  3 +--
 trunk/kernel/signal.c             |  2 +-
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 6b50947778cf..0f6c1851c663 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80fe728d593e3a048a56610de932919f7d6d968a
+refs/heads/master: 4e4c22c71144c1b2e22c257ec6cf08ccb5be1165
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index 2ce4456aad30..9964d542ae9e 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -1720,7 +1720,7 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
 		if (sigmask) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 					sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		}
 	} else if (sigmask)
 		sigprocmask(SIG_SETMASK, &sigsaved, NULL);
@@ -1791,7 +1791,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
 		if (sigmask) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 				sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		}
 		ret = -ERESTARTNOHAND;
 	} else if (sigmask)
@@ -2117,7 +2117,7 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,
 		if (err == -EINTR) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 			       sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		} else
 			sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 	}
diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c
index 0d237182d721..71af2fc0041e 100644
--- a/trunk/fs/eventpoll.c
+++ b/trunk/fs/eventpoll.c
@@ -1279,7 +1279,7 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
 		if (error == -EINTR) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 			       sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		} else
 			sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 	}
@@ -1309,4 +1309,3 @@ static int __init eventpoll_init(void)
 	return 0;
 }
 fs_initcall(eventpoll_init);
-
diff --git a/trunk/fs/select.c b/trunk/fs/select.c
index 00f58c5c7e05..32ce2b32fad1 100644
--- a/trunk/fs/select.c
+++ b/trunk/fs/select.c
@@ -498,7 +498,7 @@ asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp,
 		if (sigmask) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 					sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		}
 	} else if (sigmask)
 		sigprocmask(SIG_SETMASK, &sigsaved, NULL);
@@ -805,7 +805,7 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
 		if (sigmask) {
 			memcpy(&current->saved_sigmask, &sigsaved,
 					sizeof(sigsaved));
-			set_thread_flag(TIF_RESTORE_SIGMASK);
+			set_restore_sigmask();
 		}
 		ret = -ERESTARTNOHAND;
 	} else if (sigmask)
diff --git a/trunk/include/linux/thread_info.h b/trunk/include/linux/thread_info.h
index accd7bad35b0..43d8162c696e 100644
--- a/trunk/include/linux/thread_info.h
+++ b/trunk/include/linux/thread_info.h
@@ -92,6 +92,19 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
 #define set_need_resched()	set_thread_flag(TIF_NEED_RESCHED)
 #define clear_need_resched()	clear_thread_flag(TIF_NEED_RESCHED)
 
-#endif
+#ifdef TIF_RESTORE_SIGMASK
+/**
+ * set_restore_sigmask() - make sure saved_sigmask processing gets done
+ *
+ * This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code
+ * will run before returning to user mode, to process the flag.
+ */
+static inline void set_restore_sigmask(void)
+{
+	set_thread_flag(TIF_RESTORE_SIGMASK);
+}
+#endif	/* TIF_RESTORE_SIGMASK */
+
+#endif	/* __KERNEL__ */
 
 #endif /* _LINUX_THREAD_INFO_H */
diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c
index e1ef04870c2a..4a856a3643bb 100644
--- a/trunk/kernel/compat.c
+++ b/trunk/kernel/compat.c
@@ -898,7 +898,7 @@ asmlinkage long compat_sys_rt_sigsuspend(compat_sigset_t __user *unewset, compat
 
 	current->state = TASK_INTERRUPTIBLE;
 	schedule();
-	set_thread_flag(TIF_RESTORE_SIGMASK);
+	set_restore_sigmask();
 	return -ERESTARTNOHAND;
 }
 #endif /* __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND */
@@ -1080,4 +1080,3 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info)
 
 	return 0;
 }
-
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 9ac737e53df1..72bb4f51f963 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -2541,7 +2541,7 @@ asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
 
 	current->state = TASK_INTERRUPTIBLE;
 	schedule();
-	set_thread_flag(TIF_RESTORE_SIGMASK);
+	set_restore_sigmask();
 	return -ERESTARTNOHAND;
 }
 #endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */