From e2df0c4d89e9574be013befe6075133529b3c7d7 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 17 Nov 2011 23:43:40 +0100
Subject: [PATCH] --- yaml --- r: 283256 b: refs/heads/master c:
 2ff6fa8fafd6fa94029fa0558a6b85956930f1f5 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/security/selinux/ss/conditional.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 91143d119c7b..855022346059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8aa09fd880eb4c2881b9f3c8a8d09c0404cd4eb
+refs/heads/master: 2ff6fa8fafd6fa94029fa0558a6b85956930f1f5
diff --git a/trunk/security/selinux/ss/conditional.c b/trunk/security/selinux/ss/conditional.c
index 2ec904177fe0..377d148e7157 100644
--- a/trunk/security/selinux/ss/conditional.c
+++ b/trunk/security/selinux/ss/conditional.c
@@ -175,7 +175,7 @@ void cond_policydb_destroy(struct policydb *p)
 int cond_init_bool_indexes(struct policydb *p)
 {
 	kfree(p->bool_val_to_struct);
-	p->bool_val_to_struct = (struct cond_bool_datum **)
+	p->bool_val_to_struct =
 		kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL);
 	if (!p->bool_val_to_struct)
 		return -ENOMEM;