summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2015-06-25 22:44:11 +0200
committerRichard Weinberger <richard@nod.at>2015-06-25 22:44:11 +0200
commitda028d5e5463dabb6ede2f5e3f6cced1283988cc (patch)
tree5ca1836a6825c6f933302193701ca25b89f83317 /arch/um
parent8eeba4e9a76cd126e737d3d303d9c424b66ea90d (diff)
downloadlinux-da028d5e5463dabb6ede2f5e3f6cced1283988cc.tar.bz2
um: Don't pollute kernel namespace with uapi
Don't include ptrace uapi stuff in arch headers, it will pollute the kernel namespace and conflict with existing stuff. In this case it fixes clashes with common names like R8. Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/ptrace-generic.h1
-rw-r--r--arch/um/kernel/ptrace.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
index 283480a7ad23..2966adbbdf6c 100644
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
@@ -8,7 +8,6 @@
#ifndef __ASSEMBLY__
-#include <asm/ptrace-abi.h>
#include <sysdep/ptrace.h>
struct pt_regs {
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index cac2ea058b7a..6a826cbb15c4 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -8,6 +8,7 @@
#include <linux/sched.h>
#include <linux/tracehook.h>
#include <asm/uaccess.h>
+#include <asm/ptrace-abi.h>
void user_enable_single_step(struct task_struct *child)
{