diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-10 10:02:17 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-12-10 16:52:11 -0500 |
commit | 2d911e9a4e74ddbd059f9dabea402a119ef22e3d (patch) | |
tree | 66f94d2fd657e5958469e4d10f3c7342af79375f /include/asm-mips/system.h | |
parent | 86384d544157db23879064cde36061cdcafc6794 (diff) |
[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>
Diffstat (limited to 'include/asm-mips/system.h')
-rw-r--r-- | include/asm-mips/system.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 9428057a50cf..5e1289c85ed9 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/barrier.h> | 19 | #include <asm/barrier.h> |
20 | #include <asm/cpu-features.h> | 20 | #include <asm/cpu-features.h> |
21 | #include <asm/dsp.h> | 21 | #include <asm/dsp.h> |
22 | #include <asm/ptrace.h> | ||
23 | #include <asm/war.h> | 22 | #include <asm/war.h> |
24 | 23 | ||
25 | 24 | ||
@@ -336,14 +335,6 @@ extern void *set_except_vector(int n, void *addr); | |||
336 | extern unsigned long ebase; | 335 | extern unsigned long ebase; |
337 | extern void per_cpu_trap_init(void); | 336 | extern void per_cpu_trap_init(void); |
338 | 337 | ||
339 | extern NORET_TYPE void die(const char *, struct pt_regs *); | ||
340 | |||
341 | static inline void die_if_kernel(const char *str, struct pt_regs *regs) | ||
342 | { | ||
343 | if (unlikely(!user_mode(regs))) | ||
344 | die(str, regs); | ||
345 | } | ||
346 | |||
347 | extern int stop_a_enabled; | 338 | extern int stop_a_enabled; |
348 | 339 | ||
349 | /* | 340 | /* |