--- /dev/null
+From 61e8d462457f202bf0c6393133425ad387825e22 Mon Sep 17 00:00:00 2001
+From: Richard Weinberger <richard@nod.at>
+Date: Thu, 6 Jul 2017 09:35:27 +0200
+Subject: [PATCH] um: Correctly check for PTRACE_GETRESET/SETREGSET
+
+[ Upstream commit 61e8d462457f202bf0c6393133425ad387825e22 ]
+
+When checking for PTRACE_GETRESET/SETREGSET, make sure that
+the correct header file is included. We need linux/ptrace.h
+which contains all ptrace UAPI related defines.
+Otherwise #if defined(PTRACE_GETRESET) is always false.
+
+Cc: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+---
+ arch/x86/um/user-offsets.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/um/user-offsets.c
++++ b/arch/x86/um/user-offsets.c
+@@ -5,7 +5,7 @@
+ #include <sys/mman.h>
+ #include <sys/user.h>
+ #define __FRAME_OFFSETS
+-#include <asm/ptrace.h>
++#include <linux/ptrace.h>
+ #include <asm/types.h>
+
+ #ifdef __i386__