From 848bb25307127ac12c96f4785c9976a36288e8dd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 10 Nov 2017 16:20:12 +0100 Subject: [PATCH] fix up queue-4.4/x86-uaccess-sched-preempt-verify-access_ok-context.patch --- ...sched-preempt-verify-access_ok-context.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 8bc3bb16977..97b09f5896e 100644 --- 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 Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar +[add include/preempt.h to fix build error - gregkh] Signed-off-by: Greg Kroah-Hartman --- - 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 + #include + #include ++#include + #include + #include + #include +@@ -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 /** * 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. */ -- 2.47.2