On 2014-10-30 10:16, Gilles Chanteperdrix wrote: > On Thu, Oct 30, 2014 at 10:06:44AM +0100, Frede Florian wrote: >> Hello, >> >> I tried to patch the Kernel 3.14.22 and there is two new lines in >> the file fs/exec.c >> >> tsk->mm->vmacache_seqnum = 0; >> vmacache_flush(tsk); >> >> I am not sure if the line from the iPipe patch should placed before >> or after this lines... >> >> + ipipe_mm_switch_unprotect(flags); > > We do not have enough information to understand what you > are talking about. Show us the conflict as obtained with git merge > or with patch --merge to give us more information.
I've resolved the conflict with the vma caching that was back-ported to 3.14.x in ipipe-jki.git [1] (for-upstream/3.14 branch). Kernel works fine so far, but I didn't look into the details, if that caching thing affects us in the RT domain as well and requires more work. Jan [1] http://git.xenomai.org/ipipe-jki.git -- Siemens AG, Corporate Technology, CT RTC ITP SES-DE Corporate Competence Center Embedded Linux _______________________________________________ Xenomai mailing list [email protected] http://www.xenomai.org/mailman/listinfo/xenomai
