From 7a45a752ffaabba274074e3caeb67946a6ae41a8 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 23 Aug 2011 15:23:51 +0800
Subject: [PATCH] --- yaml --- r: 264512 b: refs/heads/master c:
 8ad346c62ae91e6376fb9d199ef8557b0c814209 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c4705d0508fc..773889b93494 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c061b5707ab84ebfe8f18f1c9c3110ae5cd6073
+refs/heads/master: 8ad346c62ae91e6376fb9d199ef8557b0c814209
diff --git a/trunk/kernel/cred.c b/trunk/kernel/cred.c
index f1e22556bc49..d84fc910e2f3 100644
--- a/trunk/kernel/cred.c
+++ b/trunk/kernel/cred.c
@@ -656,11 +656,13 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
 	if (!new)
 		return NULL;
 
+#ifdef CONFIG_KEYS
 	tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
 	if (!tgcred) {
 		kmem_cache_free(cred_jar, new);
 		return NULL;
 	}
+#endif
 
 	kdebug("prepare_kernel_cred() alloc %p", new);