Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da028d5e authored by Richard Weinberger's avatar Richard Weinberger
Browse files

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: default avatarRichard Weinberger <richard@nod.at>
parent 8eeba4e9

arch/um/include/asm/ptrace-generic.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#ifndef __ASSEMBLY__



#include <asm/ptrace-abi.h>

#include <sysdep/ptrace.h>



struct pt_regs {

arch/um/kernel/ptrace.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/x86/um/ptrace_32.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/mm.h>

#include <linux/sched.h>

#include <asm/uaccess.h>

#include <asm/ptrace-abi.h>

#include <skas.h>



extern int arch_switch_tls(struct task_struct *to);

arch/x86/um/ptrace_64.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define __FRAME_OFFSETS

#include <asm/ptrace.h>

#include <asm/uaccess.h>

#include <asm/ptrace-abi.h>



/*

 * determines which flags the user has access to.

arch/x86/um/tls_32.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/sched.h>

#include <linux/syscalls.h>

#include <asm/uaccess.h>

#include <asm/ptrace-abi.h>

#include <os.h>

#include <skas.h>

#include <sysdep/tls.h>