diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-10 15:02:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-12-10 21:52:11 +0000 |
| commit | 2d911e9a4e74ddbd059f9dabea402a119ef22e3d (patch) | |
| tree | 66f94d2fd657e5958469e4d10f3c7342af79375f | |
| parent | 86384d544157db23879064cde36061cdcafc6794 (diff) | |
| download | linux-3.10-2d911e9a4e74ddbd059f9dabea402a119ef22e3d.tar.gz linux-3.10-2d911e9a4e74ddbd059f9dabea402a119ef22e3d.tar.bz2 linux-3.10-2d911e9a4e74ddbd059f9dabea402a119ef22e3d.zip | |
[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: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | include/asm-mips/ptrace.h | 8 | ||||
| -rw-r--r-- | include/asm-mips/system.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h index 30bf555faea..8a1f2b6f04a 100644 --- a/include/asm-mips/ptrace.h +++ b/include/asm-mips/ptrace.h @@ -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 */ diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 9428057a50c..5e1289c85ed 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -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; /* |