---

yaml --- r: 264512 b: refs/heads/master c: 8ad346c h: refs/heads/master v: v3
git-mirror · Aug 23, 2011 · 7a45a75 · 7a45a75
1 parent 05e3124
commit 7a45a75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);