fix up queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch

diff --git a/queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch b/queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch
index 8bc3bb1697709e915a027d5b53186568ad87892f..97b09f5896ef3c7e765f0f74a89135db859f0f61 100644 (file)
--- a/queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch
+++ b/queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch
@@ -18,16 +18,25 @@ Cc: Peter Zijlstra <peterz@infradead.org>
 Cc: Thomas Gleixner <tglx@linutronix.de>
 Cc: linux-kernel@vger.kernel.org
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
+[add include/preempt.h to fix build error - gregkh]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- arch/x86/include/asm/uaccess.h |   13 +++++++++++--
+ arch/x86/include/asm/uaccess.h |   14 ++++++++++++--
  include/linux/preempt.h        |   21 +++++++++++++--------
- 2 files changed, 24 insertions(+), 10 deletions(-)
+ 2 files changed, 25 insertions(+), 10 deletions(-)
 
 --- a/arch/x86/include/asm/uaccess.h
 +++ b/arch/x86/include/asm/uaccess.h
-@@ -66,6 +66,12 @@ static inline bool __chk_range_not_ok(un
+@@ -7,6 +7,7 @@
+ #include <linux/compiler.h>
+ #include <linux/thread_info.h>
+ #include <linux/string.h>
++#include <linux/preempt.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+ #include <asm/smap.h>
+@@ -66,6 +67,12 @@ static inline bool __chk_range_not_ok(un
        __chk_range_not_ok((unsigned long __force)(addr), size, limit); \
  })
  
@@ -40,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /**
   * access_ok: - Checks if a user space pointer is valid
   * @type: Type of access: %VERIFY_READ or %VERIFY_WRITE.  Note that
-@@ -86,8 +92,11 @@ static inline bool __chk_range_not_ok(un
+@@ -86,8 +93,11 @@ static inline bool __chk_range_not_ok(un
   * checks that the pointer is in the user space range - after calling
   * this function, memory access functions may still return -EFAULT.
   */