I'm attaching the files. -- VL On Thu, Apr 3, 2008 at 12:08 PM, Gilles Chanteperdrix < [EMAIL PROTECTED]> wrote:
> On Thu, Apr 3, 2008 at 6:04 PM, Vincent Levesque <[EMAIL PROTECTED]> > wrote: > > Hi Gilles, > > > > I tried the patch on both linux-2.6.24.4+xeno-2.4.2 and > > linux2.6.24.3+xeno-2.4.2 (like Tomas). In both cases I get errors > messages > > when patching: > > > > [EMAIL PROTECTED]:/usr/src/linux-2.6.24.3-xn242# patch -p1 < 6.patch > > patching file include/linux/mm.h > > Hunk #1 FAILED at 104. > > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej > > patching file mm/memory.c > > Hunk #1 FAILED at 584. > > 1 out of 1 hunk FAILED -- saving rejects to file mm/memory.c.rej > > > > Am I using the right version of linux and xenomai? Was I supposed to > apply > > other patches first? I had to fix the patch a bit (line endings were > mangled > > in the email) but I don't think I broke anything. > > What do the rejects look like ? > > > > > Out of curiosity, can you reproduce the bug? > > I have not tried yet. > > -- > Gilles >
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7f27db6..a0c80c7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -104,10 +104,11 @@ extern unsigned int kobjsize(const void *objp);
#define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */
#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */
#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */
-#define VM_PINNED 0x08000000 /* Disable faults for the vma */
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
+#define VM_PINNED 0x10000000 /* Disable faults for the vma */
+
#ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */
#define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
#endif
diff --git a/mm/memory.c b/mm/memory.c
index e0e7a3d..32d6cb6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -584,8 +584,14 @@ again:
if (is_cow_mapping(vma->vm_flags)) {
if (((vma->vm_flags|src_mm->def_flags) & (VM_LOCKED|VM_PINNED))
== (VM_LOCKED|VM_PINNED)) {
+ arch_leave_lazy_mmu_mode();
+ spin_unlock(src_ptl);
+ pte_unmap_nested(src_pte);
+ add_mm_rss(dst_mm, rss[0], rss[1]);
+ pte_unmap_unlock(dst_pte, dst_ptl);
+ cond_resched();
do_cow_break = 1;
- break;
+ goto again;
}
}
}
memory.c.rej
Description: application/reject
mm.h.rej
Description: application/reject
_______________________________________________ Xenomai-help mailing list [email protected] https://mail.gna.org/listinfo/xenomai-help
