From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Ivan Adzhubey To: sisyphus@altlinux.ru Date: Tue, 21 Dec 2004 23:58:00 -0500 User-Agent: KMail/1.7.1 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_Y7PyBLTmvQPqzPK" Message-Id: <200412212358.00131.iadzhubey@rics.bwh.harvard.edu> X-Authentication-Info: Submitted using SMTP AUTH at out012.verizon.net from [68.163.134.28] at Tue, 21 Dec 2004 22:58:00 -0600 Subject: [sisyphus] =?koi8-r?b?7sUg0NLPyM/EydQg08LP0svB?= 2.4.27-om-smp X-BeenThere: sisyphus@altlinux.ru X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ALT Linux Sisyphus discussion list List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2004 04:58:05 -0000 Archived-At: List-Archive: --Boundary-00=_Y7PyBLTmvQPqzPK Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 8bit Content-Disposition: inline Приветствую! Что-то у меня не получается пересобрать 2.4.27-om-smp-alt1: Hunk #1 succeeded at 323 (offset 3 lines). patching file fs/binfmt_aout.c Hunk #2 succeeded at 117 (offset 5 lines). Hunk #4 succeeded at 279 (offset 5 lines). Hunk #6 succeeded at 335 (offset 5 lines). Hunk #8 FAILED at 410. Hunk #9 FAILED at 450. Hunk #10 succeeded at 487 (offset 9 lines). 2 out of 11 hunks FAILED -- saving rejects to file fs/binfmt_aout.c.rej binfmt_aout.c.rej прицепляю. -- Иван --Boundary-00=_Y7PyBLTmvQPqzPK Content-Type: text/x-diff; charset="koi8-r"; name="binfmt_aout.c.rej" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="binfmt_aout.c.rej" *************** *** 379,402 **** goto beyond_if; } down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_TXTADDR(ex), ex.a_text, PROT_READ | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset); up_write(¤t->mm->mmap_sem); if (error != N_TXTADDR(ex)) { send_sig(SIGKILL, current, 0); return error; } down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); if (error != N_DATADDR(ex)) { send_sig(SIGKILL, current, 0); return error; --- 410,447 ---- goto beyond_if; } + #ifdef CONFIG_MOSIX + error = do_mmap_down(bprm->file, N_TXTADDR(ex), ex.a_text, + PROT_READ | PROT_EXEC, + MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, + fd_offset); + #else down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_TXTADDR(ex), ex.a_text, PROT_READ | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset); up_write(¤t->mm->mmap_sem); + #endif /* CONFIG_MOSIX */ if (error != N_TXTADDR(ex)) { send_sig(SIGKILL, current, 0); return error; } + #ifdef CONFIG_MOSIX + error = do_mmap_down(bprm->file, N_DATADDR(ex), ex.a_data, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, + fd_offset + ex.a_text); + #else down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); + #endif /* CONFIG_MOSIX */ if (error != N_DATADDR(ex)) { send_sig(SIGKILL, current, 0); return error; *************** *** 405,412 **** beyond_if: set_binfmt(&aout_format); set_brk(current->mm->start_brk, current->mm->brk); retval = setup_arg_pages(bprm); if (retval < 0) { /* Someone check-me: is this error path enough? */ --- 450,476 ---- beyond_if: set_binfmt(&aout_format); + #ifdef CONFIG_MOSIX + /* if DEPUTY, the REMOTE already did "set_brk" in aout_remote_init_mm */ + if(!(current->mosix.dflags & DDEPUTY)) + #endif /* CONFIG_MOSIX */ set_brk(current->mm->start_brk, current->mm->brk); + #ifdef CONFIG_MOSIX + if(current->mosix.dflags & DDEPUTY) + { + retval = mosix_deputy_setup_args(SETUP_ARGS_AS_AOUT, + &start_stack); + if(retval < 0) + { + send_sig(SIGKILL, current, 0); + return(retval); + } + mosix_obtain_registers(START_THREAD_REGS); + } + else + { + #endif /* CONFIG_MOSIX */ retval = setup_arg_pages(bprm); if (retval < 0) { /* Someone check-me: is this error path enough? */ --Boundary-00=_Y7PyBLTmvQPqzPK--