git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
signal.c
diff --git
a/arch/arm/kernel/signal.c
b/arch/arm/kernel/signal.c
index 5814298ef0b701e61e4de018aa216009c9445d30..e2de50bf87425e4a55baa66ef68d1fe99e53e1f8 100644
(file)
--- a/
arch/arm/kernel/signal.c
+++ b/
arch/arm/kernel/signal.c
@@
-14,6
+14,7
@@
#include <linux/uaccess.h>
#include <linux/tracehook.h>
#include <linux/uprobes.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
#include <linux/uprobes.h>
+#include <linux/syscalls.h>
#include <asm/elf.h>
#include <asm/cacheflush.h>
#include <asm/elf.h>
#include <asm/cacheflush.h>
@@
-613,6
+614,10
@@
do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
* Update the trace code with the current status.
*/
trace_hardirqs_off();
* Update the trace code with the current status.
*/
trace_hardirqs_off();
+
+ /* Check valid user FS if needed */
+ addr_limit_user_check();
+
do {
if (likely(thread_flags & _TIF_NEED_RESCHED)) {
schedule();
do {
if (likely(thread_flags & _TIF_NEED_RESCHED)) {
schedule();