Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index e2de50bf8742..b67ae12503f3 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -614,10 +614,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
          * 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();
@@ -678,3 +674,9 @@ struct page *get_signal_page(void)
 
         return page;
 }
+
+/* Defer to generic check */
+asmlinkage void addr_limit_check_failed(void)
+{
+        addr_limit_user_check();
+}