[sisyphus] Не проходит сборка 2.4.27-om-smp

[Ivan Adzhubey <iadzhubey@rics.bwh.harvard.edu>]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Приветствую!

Что-то у меня не получается пересобрать 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 прицепляю.

-- 
Иван




[-- Attachment #2: binfmt_aout.c.rej --]
[-- Type: text/x-diff, Size: 2990 bytes --]

***************
*** 379,402 ****
  			goto beyond_if;
  		}
  
  		down_write(&current->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(&current->mm->mmap_sem);
  
  		if (error != N_TXTADDR(ex)) {
  			send_sig(SIGKILL, current, 0);
  			return error;
  		}
  
  		down_write(&current->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(&current->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(&current->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(&current->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(&current->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(&current->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? */