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

Commit 2d911e9a authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Move die and die_if_kernel() from system.h to ptrace.h 



This eleminates the need to include ptrace.h into system.h and fixes a
harmless namespace conflict on the PC symbol in bpck.c.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 86384d54

include/asm-mips/ptrace.h

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,14 @@ struct pt_regs { 


extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);



extern NORET_TYPE void die(const char *, struct pt_regs *);



static inline void die_if_kernel(const char *str, struct pt_regs *regs)

{

	if (unlikely(!user_mode(regs)))

		die(str, regs);

}



#endif



#endif /* _ASM_PTRACE_H */

include/asm-mips/system.h

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

#include <asm/cpu-features.h>

#include <asm/dsp.h>

#include <asm/ptrace.h>

#include <asm/war.h>
@@ -336,14 +335,6 @@ extern void *set_except_vector(int n, void *addr); 
extern unsigned long ebase;

extern void per_cpu_trap_init(void);



extern NORET_TYPE void die(const char *, struct pt_regs *);



static inline void die_if_kernel(const char *str, struct pt_regs *regs)

{

	if (unlikely(!user_mode(regs)))

		die(str, regs);

}



extern int stop_a_enabled;



/*