Log message:
reapply changes lost during merge
Modified files:
linux/arch/m68k/kernel:
process.c
Index: linux/arch/m68k/kernel/process.c
Stats: 4 modifications
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/kernel/process%2ec.diff?r1=1.1.1.16&r2=1.22
========================================================================
--- process.c 29 Aug 2005 14:16:31 -0000 1.1.1.16
+++ process.c 29 Aug 2005 20:32:58 -0000 1.22
@@ -239,7 +239,7 @@
unsigned long stack_offset, *retp;
stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
- childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) +
stack_offset);
+ childregs = (struct pt_regs *) ((unsigned long)p->stack + stack_offset);
*childregs = *regs;
childregs->d0 = 0;
@@ -384,7 +384,7 @@
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
- stack_page = (unsigned long)(p->thread_info);
+ stack_page = (unsigned long)p->stack;
fp = ((struct switch_stack *)p->thread.ksp)->a6;
do {
if (fp < stack_page+sizeof(struct thread_info) ||
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit"
in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
