diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:58 -0500 |
commit | 95ca0dc603ab58f3e4c5a1c23f675bd1f5b5fef3 (patch) | |
tree | 367ddcc3858b9c3e852ea2f6bafaffd43424c9e5 /arch/cris/arch-v10 | |
parent | 0cec6fd1370807f98934e84c9e6147335b81d8a5 (diff) |
[PATCH] cris: task_pt_regs()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/cris/arch-v10/kernel/ptrace.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index 69e28b4057e8..0a675ce9e099 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c | |||
@@ -79,7 +79,7 @@ void hard_reset_now (void) | |||
79 | */ | 79 | */ |
80 | unsigned long thread_saved_pc(struct task_struct *t) | 80 | unsigned long thread_saved_pc(struct task_struct *t) |
81 | { | 81 | { |
82 | return (unsigned long)user_regs(t->thread_info)->irp; | 82 | return task_pt_regs(t)->irp; |
83 | } | 83 | } |
84 | 84 | ||
85 | static void kernel_thread_helper(void* dummy, int (*fn)(void *), void * arg) | 85 | static void kernel_thread_helper(void* dummy, int (*fn)(void *), void * arg) |
@@ -128,7 +128,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
128 | * remember that the task_struct doubles as the kernel stack for the task | 128 | * remember that the task_struct doubles as the kernel stack for the task |
129 | */ | 129 | */ |
130 | 130 | ||
131 | childregs = user_regs(p->thread_info); | 131 | childregs = task_pt_regs(p); |
132 | 132 | ||
133 | *childregs = *regs; /* struct copy of pt_regs */ | 133 | *childregs = *regs; /* struct copy of pt_regs */ |
134 | 134 | ||
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c index 6cbd34a27b90..f214f74f264e 100644 --- a/arch/cris/arch-v10/kernel/ptrace.c +++ b/arch/cris/arch-v10/kernel/ptrace.c | |||
@@ -37,7 +37,7 @@ inline long get_reg(struct task_struct *task, unsigned int regno) | |||
37 | if (regno == PT_USP) | 37 | if (regno == PT_USP) |
38 | return task->thread.usp; | 38 | return task->thread.usp; |
39 | else if (regno < PT_MAX) | 39 | else if (regno < PT_MAX) |
40 | return ((unsigned long *)user_regs(task->thread_info))[regno]; | 40 | return ((unsigned long *)task_pt_regs(task))[regno]; |
41 | else | 41 | else |
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
@@ -51,7 +51,7 @@ inline int put_reg(struct task_struct *task, unsigned int regno, | |||
51 | if (regno == PT_USP) | 51 | if (regno == PT_USP) |
52 | task->thread.usp = data; | 52 | task->thread.usp = data; |
53 | else if (regno < PT_MAX) | 53 | else if (regno < PT_MAX) |
54 | ((unsigned long *)user_regs(task->thread_info))[regno] = data; | 54 | ((unsigned long *)task_pt_regs(task))[regno] = data; |
55 | else | 55 | else |
56 | return -1; | 56 | return -1; |
57 | return 0; | 57 | return 0; |