Skip to content

Commit

Permalink
[MIPS] Move die and die_if_kernel() from system.h to ptrace.h
Browse files Browse the repository at this point in the history
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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Dec 10, 2006
1 parent 86384d5 commit 2d911e9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
8 changes: 8 additions & 0 deletions include/asm-mips/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
9 changes: 0 additions & 9 deletions include/asm-mips/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down Expand Up @@ -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;

/*
Expand Down

0 comments on commit 2d911e9

Please sign in to comment.