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

Commit 835e4177 authored by Rabin Vincent's avatar Rabin Vincent Committed by Jesper Nilsson
Browse files

CRIS: UAPI: fix ptrace.h 



The exported ptrace.h header on CRIS references an "arch" directory
which does not exist.  Fix this by having the variants in the same
directory and including them conditionally, similar to other
architectures.

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 4b867157

arch/cris/arch-v32/kernel/signal.c

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

#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <arch/ptrace.h>

#include <arch/hwregs/cpu_vect.h>



extern unsigned long cris_signal_return_page;

arch/cris/include/arch-v32/arch/irqflags.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __ASM_CRIS_ARCH_IRQFLAGS_H



#include <linux/types.h>

#include <arch/ptrace.h>

#include <asm/ptrace.h>



static inline unsigned long arch_local_save_flags(void)

{

arch/cris/include/uapi/asm/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ header-y += param.h 
header-y += poll.h

header-y += posix_types.h

header-y += ptrace.h

header-y += ptrace_v10.h

header-y += ptrace_v32.h

header-y += resource.h

header-y += rs485.h

header-y += sembuf.h

arch/cris/include/uapi/asm/ptrace.h

+5 −1
Original line number Diff line number Diff line 
#include <arch/ptrace.h>
 
#ifdef __arch_v32

#include <asm/ptrace_v32.h>

#else

#include <asm/ptrace_v10.h>

#endif