projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
include
/
asm-mips
/
ptrace.h
diff --git
a/include/asm-mips/ptrace.h
b/include/asm-mips/ptrace.h
index
8a1f2b6
..
786f7e3
100644
(file)
--- a/
include/asm-mips/ptrace.h
+++ b/
include/asm-mips/ptrace.h
@@
-21,6
+21,7
@@
#define FPC_EIR 70
#define DSP_BASE 71 /* 3 more hi / lo register pairs */
#define DSP_CONTROL 77
#define FPC_EIR 70
#define DSP_BASE 71 /* 3 more hi / lo register pairs */
#define DSP_CONTROL 77
+#define ACX 78
/*
* This struct defines the way the registers are stored on the stack during a
/*
* This struct defines the way the registers are stored on the stack during a
@@
-39,6
+40,9
@@
struct pt_regs {
unsigned long cp0_status;
unsigned long hi;
unsigned long lo;
unsigned long cp0_status;
unsigned long hi;
unsigned long lo;
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+ unsigned long acx;
+#endif
unsigned long cp0_badvaddr;
unsigned long cp0_cause;
unsigned long cp0_epc;
unsigned long cp0_badvaddr;
unsigned long cp0_cause;
unsigned long cp0_epc;
@@
-82,9
+86,9
@@
struct pt_regs {
extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);
extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);
-extern NORET_TYPE void die(const char *,
struct pt_regs *)
;
+extern NORET_TYPE void die(const char *,
const struct pt_regs *) ATTRIB_NORET
;
-static inline void die_if_kernel(const char *str, struct pt_regs *regs)
+static inline void die_if_kernel(const char *str,
const
struct pt_regs *regs)
{
if (unlikely(!user_mode(regs)))
die(str, regs);
{
if (unlikely(!user_mode(regs)))
die(str, regs);