On Fri, 12 Sep 2008 16:53:12 -0700
akpm@linux-foundation.org wrote:
> ------------------------------------------------------
> Subject: itimers: fix itimer/many thread hang
> From: Frank Mayhar
>


Just a notification of confliction in the latext mmtom.
- with linux-next

==
Fix build error with selinux(from the change in linux-next.patch) and
patches/itimers-fix-itimer-many-thread-hang.patch


Signed-off-by: KAMEZAWA Hiroyuki


Index: linux-2.6.27-rc6+/security/selinux/hooks.c
================================================== =================
--- linux-2.6.27-rc6+.orig/security/selinux/hooks.c
+++ linux-2.6.27-rc6+/security/selinux/hooks.c
@@ -2322,7 +2322,7 @@ static void selinux_bprm_committing_cred
* This will cause RLIMIT_CPU calculations to be
* refigured.
*/
- current->it_prof_expires = jiffies_to_cputime(1);
+ current->signal->it_prof_expires = jiffies_to_cputime(1);
}
}
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/