Re: 2.6.8-rc4-mm1

[William Lee Irwin III]

On Tue, Aug 10, 2004 at 03:28:40PM -0700, William Lee Irwin III wrote:
> Please, let's do this instead:

Index: mm1-2.6.8-rc4/arch/ia64/kernel/smpboot.c
===================================================================
--- mm1-2.6.8-rc4.orig/arch/ia64/kernel/smpboot.c	2004-08-10 15:21:56.215915699 -0700
+++ mm1-2.6.8-rc4/arch/ia64/kernel/smpboot.c	2004-08-10 15:22:39.504001106 -0700
@@ -367,7 +367,7 @@
 {
 	struct create_idle *c_idle = _c_idle;
 
-	c_idle->idle = fork_idle(c_idle->cpu);
+	c_idle->idle = __fork_idle(c_idle->cpu, NULL);
 	complete(&c_idle->done);
 }
 
Index: mm1-2.6.8-rc4/include/linux/sched.h
===================================================================
--- mm1-2.6.8-rc4.orig/include/linux/sched.h	2004-08-10 15:21:56.215915699 -0700
+++ mm1-2.6.8-rc4/include/linux/sched.h	2004-08-10 15:29:30.376066386 -0700
@@ -831,6 +831,7 @@
 
 extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);
 extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
+task_t *__fork_idle(int, struct pt_regs *);
 task_t *fork_idle(int);
 
 extern void set_task_comm(struct task_struct *tsk, char *from);
Index: mm1-2.6.8-rc4/kernel/fork.c
===================================================================
--- mm1-2.6.8-rc4.orig/kernel/fork.c	2004-08-10 15:21:56.200290699 -0700
+++ mm1-2.6.8-rc4/kernel/fork.c	2004-08-10 15:26:59.940521353 -0700
@@ -1192,11 +1192,15 @@
 
 task_t * __init fork_idle(int cpu)
 {
-	task_t *task;
 	struct pt_regs regs;
 
 	memset(&regs, 0, sizeof(struct pt_regs));
-	task = copy_process(CLONE_VM, 0, &regs, 0, NULL, NULL, 0);
+	return __fork_idle(cpu, &regs);
+}
+
+task_t * __init __fork_idle(int cpu, struct pt_regs *regs)
+{
+	task_t *task = copy_process(CLONE_VM, 0, regs, 0, NULL, NULL, 0);
 	if (!task)
 		return ERR_PTR(-ENOMEM);
 	init_idle(task, cpu);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/