[rsbac] Hunk #4 FAILED at 793--with pax for 2.6.6 applied

[Roy Lanek]

Vanilla kernel 2.6.6 [Slackware]

trying to apply [--dry-run] patch-2.6.6-v1.2.3-pre5

I get:

Hunk #4 FAILED at 793.

with pax-linux-2.6.6-200405172250.patch applied.

And zero problems with pax-linux-2.6.6-200405172250.patch
-R[eversed] ...

It would create .../linux/mm/mmap.c.rej

Cheers,

/Roy Lanek (West Sumatra)

P.S.: mmap.c.rej as attachment.

-------------- next part --------------
***************
*** 743,748 ****
  					pgoff, flags & MAP_NONBLOCK);
  		down_write(&mm->mmap_sem);
  	}
  	return addr;
  
  unmap_and_free_vma:
--- 793,825 ----
  					pgoff, flags & MAP_NONBLOCK);
  		down_write(&mm->mmap_sem);
  	}
+ 
+         /* RSBAC: notify ADF of mapped segment */
+         #ifdef CONFIG_RSBAC
+         if(prot & PROT_EXEC)
+           {
+             union rsbac_target_id_t rsbac_new_target_id;
+ 
+ #ifdef CONFIG_RSBAC_DEBUG
+             if (rsbac_debug_aef)
+               printk(KERN_DEBUG "do_mmap_pgoff() [do_mmap() [sys_mmap()]]: calling ADF_set_attr\n");
+ #endif
+             rsbac_new_target_id.dummy = 0;
+             if (rsbac_adf_set_attr(R_MAP_EXEC,
+                                    current->pid,
+                                    rsbac_target,
+                                    rsbac_target_id,
+                                    T_NONE,
+                                    rsbac_new_target_id,
+                                    A_none,
+                                    rsbac_attribute_value))
+               {
+                 printk(KERN_WARNING
+                        "do_mmap_pgoff() [do_mmap() [sys_mmap()]]: rsbac_adf_set_attr() returned error\n");
+               }
+           }
+         #endif
+ 
  	return addr;
  
  unmap_and_free_vma: