[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20080917172154.b79a7f8c.kamezawa.hiroyu@jp.fujitsu.com>
Date: Wed, 17 Sep 2008 17:21:54 +0900
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
To: linux-kernel@...r.kernel.org
Cc: akpm@...ux-foundation.org, fmayhar@...gle.com, adobriyan@...il.com,
mingo@...e.hu, oleg@...sign.ru, roland@...hat.com,
tglx@...utronix.de, sds@...ho.nsa.gov
Subject: Re: + itimers-fix-itimer-many-thread-hang.patch added to -mm tree
On Fri, 12 Sep 2008 16:53:12 -0700
akpm@...ux-foundation.org wrote:
> ------------------------------------------------------
> Subject: itimers: fix itimer/many thread hang
> From: Frank Mayhar <fmayhar@...gle.com>
>
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 <kamezawa.hiroyu@...fujitsu.com>
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists