Messages in this thread | | | Date | Sun, 21 Mar 2004 22:22:41 +0100 | From | Eric Valette <> | Subject | Re: 2.6.5-rc2-mm1 does not boot. 2.6.5-rc1-mm2 + small fix from axboe was fine |
| |
Zwane Mwaikambo wrote:
> How about the following patch?
Part of this does not apply...
> --- linux-2.6.5-rc2-mm1/init/main.c 21 Mar 2004 17:02:18 -0000 > 1.1.1.1 > +++ linux-2.6.5-rc2-mm1/init/main.c 21 Mar 2004 20:54:19 -0000 > @@ -586,8 +586,8 @@ static int free_initmem_on_exec_helper(v > char c; > > sys_close(fd[1]); > - sys_read(fd[0], &c, 1); > - free_initmem(); > + if (sys_read(fd[0], &c, 1) > 0) > + free_initmem(); > return 0; > }
This part does apply. I made it by hand...
> > @@ -596,7 +596,7 @@ static void free_initmem_on_exec(void) > int fd[2]; > > do_pipe(fd); > - kernel_thread(free_initmem_on_exec_helper, &fd, SIGCHLD); > + kernel_thread(free_initmem_on_exec_helper, &fd, SIGCHLD);
Cosmetic change but yes...
> > sys_dup2(fd[1], 255); /* to get it out of the way */ > sys_close(fd[0]); > @@ -643,6 +643,7 @@ static int init(void * unused) > run_init_process("/init"); > > prepare_namespace(); > + free_initmem();
This is already done (plus a comment....)???
-- __ / ` Eric Valette /-- __ o _. 6 rue Paul Le Flem (___, / (_(_(__ 35740 Pace
Tel: +33 (0)2 99 85 26 76 Fax: +33 (0)2 99 85 26 76 E-mail: eric.valette@free.fr
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |