From 8437e291042233370d1e18d7c045862cf8158867 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Wed, 29 Jun 2011 13:07:52 +0900
Subject: [PATCH] --- yaml --- r: 260933 b: refs/heads/master c:
 7986cf28bc5050967a7056d6eadda7f16f84eaab h: refs/heads/master i:   260931:
 2f553b1ec5c854cff36e7670f07627fc1c93bd32 v: v3

---
 [refs]                         | 2 +-
 trunk/security/tomoyo/tomoyo.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 381e2afce619..a15ce505e0d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da3f1c7b7d34e66cf571a613525ca0d23f92d42f
+refs/heads/master: 7986cf28bc5050967a7056d6eadda7f16f84eaab
diff --git a/trunk/security/tomoyo/tomoyo.c b/trunk/security/tomoyo/tomoyo.c
index 2615c7d43960..d6f68a0ec2dc 100644
--- a/trunk/security/tomoyo/tomoyo.c
+++ b/trunk/security/tomoyo/tomoyo.c
@@ -51,12 +51,14 @@ static int tomoyo_bprm_set_creds(struct linux_binprm *bprm)
 	 */
 	if (bprm->cred_prepared)
 		return 0;
+#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
 	/*
 	 * Load policy if /sbin/tomoyo-init exists and /sbin/init is requested
 	 * for the first time.
 	 */
 	if (!tomoyo_policy_loaded)
 		tomoyo_load_policy(bprm->filename);
+#endif
 	/*
 	 * Release reference to "struct tomoyo_domain_info" stored inside
 	 * "bprm->cred->security". New reference to "struct tomoyo_domain_info"