aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:05:50 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:08:54 -0500
commit04fe6faf10c310480151667e7fe3e06df4208a8e (patch)
tree14dc22d1bd96e438a71d9434b07d9e49d072ea9a /arch/xtensa/kernel
parent30af7120fe6cfa8cf9ccd0626474fa1cd6d2bd59 (diff)
[PATCH] xtensa: task_pt_regs(), task_stack_page()
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/xtensa/kernel')
-rw-r--r--arch/xtensa/kernel/process.c4
-rw-r--r--arch/xtensa/kernel/ptrace.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 6a44b54ae817..f1f596644bfc 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -145,7 +145,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
145 int user_mode = user_mode(regs); 145 int user_mode = user_mode(regs);
146 146
147 /* Set up new TSS. */ 147 /* Set up new TSS. */
148 tos = (unsigned long)p->thread_info + THREAD_SIZE; 148 tos = (unsigned long)task_stack_page(p) + THREAD_SIZE;
149 if (user_mode) 149 if (user_mode)
150 childregs = (struct pt_regs*)(tos - PT_USER_SIZE); 150 childregs = (struct pt_regs*)(tos - PT_USER_SIZE);
151 else 151 else
@@ -217,7 +217,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
217unsigned long get_wchan(struct task_struct *p) 217unsigned long get_wchan(struct task_struct *p)
218{ 218{
219 unsigned long sp, pc; 219 unsigned long sp, pc;
220 unsigned long stack_page = (unsigned long) p->thread_info; 220 unsigned long stack_page = (unsigned long) task_stack_page(p);
221 int count = 0; 221 int count = 0;
222 222
223 if (!p || p == current || p->state == TASK_RUNNING) 223 if (!p || p == current || p->state == TASK_RUNNING)
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index ab5c4c65b5c4..4cc85285a70a 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -72,7 +72,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
72 struct pt_regs *regs; 72 struct pt_regs *regs;
73 unsigned long tmp; 73 unsigned long tmp;
74 74
75 regs = xtensa_pt_regs(child); 75 regs = task_pt_regs(child);
76 tmp = 0; /* Default return value. */ 76 tmp = 0; /* Default return value. */
77 77
78 switch(addr) { 78 switch(addr) {
@@ -149,7 +149,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
149 case PTRACE_POKEUSR: 149 case PTRACE_POKEUSR:
150 { 150 {
151 struct pt_regs *regs; 151 struct pt_regs *regs;
152 regs = xtensa_pt_regs(child); 152 regs = task_pt_regs(child);
153 153
154 switch (addr) { 154 switch (addr) {
155 case REG_AR_BASE ... REG_AR_BASE + XCHAL_NUM_AREGS - 1: 155 case REG_AR_BASE ... REG_AR_BASE + XCHAL_NUM_AREGS - 1:
@@ -240,7 +240,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
240 * elf_gregset_t format. */ 240 * elf_gregset_t format. */
241 241
242 xtensa_gregset_t format; 242 xtensa_gregset_t format;
243 struct pt_regs *regs = xtensa_pt_regs(child); 243 struct pt_regs *regs = task_pt_regs(child);
244 244
245 do_copy_regs (&format, regs, child); 245 do_copy_regs (&format, regs, child);
246 246
@@ -257,7 +257,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
257 * values in the elf_gregset_t format. */ 257 * values in the elf_gregset_t format. */
258 258
259 xtensa_gregset_t format; 259 xtensa_gregset_t format;
260 struct pt_regs *regs = xtensa_pt_regs(child); 260 struct pt_regs *regs = task_pt_regs(child);
261 261
262 if (copy_from_user(&format,(void *)data,sizeof(elf_gregset_t))){ 262 if (copy_from_user(&format,(void *)data,sizeof(elf_gregset_t))){
263 ret = -EFAULT; 263 ret = -EFAULT;
@@ -281,7 +281,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
281 * elf_fpregset_t format. */ 281 * elf_fpregset_t format. */
282 282
283 elf_fpregset_t fpregs; 283 elf_fpregset_t fpregs;
284 struct pt_regs *regs = xtensa_pt_regs(child); 284 struct pt_regs *regs = task_pt_regs(child);
285 285
286 do_save_fpregs (&fpregs, regs, child); 286 do_save_fpregs (&fpregs, regs, child);
287 287
@@ -299,7 +299,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
299 * values in the elf_fpregset_t format. 299 * values in the elf_fpregset_t format.
300 */ 300 */
301 elf_fpregset_t fpregs; 301 elf_fpregset_t fpregs;
302 struct pt_regs *regs = xtensa_pt_regs(child); 302 struct pt_regs *regs = task_pt_regs(child);
303 303
304 ret = 0; 304 ret = 0;
305 if (copy_from_user(&fpregs, (void *)data, sizeof(elf_fpregset_t))) { 305 if (copy_from_user(&fpregs, (void *)data, sizeof(elf_fpregset_t))) {