Commit 768595ff authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] m68k: task_stack_page()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 097cb338
...@@ -238,10 +238,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, ...@@ -238,10 +238,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
{ {
struct pt_regs * childregs; struct pt_regs * childregs;
struct switch_stack * childstack, *stack; struct switch_stack * childstack, *stack;
unsigned long stack_offset, *retp; unsigned long *retp;
stack_offset = THREAD_SIZE - sizeof(struct pt_regs); childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
*childregs = *regs; *childregs = *regs;
childregs->d0 = 0; childregs->d0 = 0;
...@@ -386,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p) ...@@ -386,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p)
if (!p || p == current || p->state == TASK_RUNNING) if (!p || p == current || p->state == TASK_RUNNING)
return 0; return 0;
stack_page = (unsigned long)(p->thread_info); stack_page = (unsigned long)task_stack_page(p);
fp = ((struct switch_stack *)p->thread.ksp)->a6; fp = ((struct switch_stack *)p->thread.ksp)->a6;
do { do {
if (fp < stack_page+sizeof(struct thread_info) || if (fp < stack_page+sizeof(struct thread_info) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment