From 565ed775ff8e5b3295b874822ce9f41c04ebbf00 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Fri, 6 Jan 2006 00:11:23 -0800
Subject: [PATCH] --- yaml --- r: 16341 b: refs/heads/master c:
 32725ad8430b58e42c5d54757ce7871e680d05cb h: refs/heads/master i:   16339:
 4ae280cb0795d8d91ae8f443776eba940b38489f v: v3

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

diff --git a/[refs] b/[refs]
index fd90f1d758bd..b4be0413c962 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e20a64a3913819133fefeca466211c7eb8adda1
+refs/heads/master: 32725ad8430b58e42c5d54757ce7871e680d05cb
diff --git a/trunk/security/selinux/ss/avtab.c b/trunk/security/selinux/ss/avtab.c
index dde094feb20d..d049c7acbc8b 100644
--- a/trunk/security/selinux/ss/avtab.c
+++ b/trunk/security/selinux/ss/avtab.c
@@ -359,7 +359,7 @@ int avtab_read_item(void *fp, u32 vers, struct avtab *a,
 			return -1;
 		}
 
-		for (i = 0; i < sizeof(spec_order)/sizeof(u16); i++) {
+		for (i = 0; i < ARRAY_SIZE(spec_order); i++) {
 			if (val & spec_order[i]) {
 				key.specified = spec_order[i] | enabled;
 				datum.data = le32_to_cpu(buf32[items++]);
diff --git a/trunk/security/selinux/ss/policydb.c b/trunk/security/selinux/ss/policydb.c
index 0ac311dc8371..0111990ba837 100644
--- a/trunk/security/selinux/ss/policydb.c
+++ b/trunk/security/selinux/ss/policydb.c
@@ -103,7 +103,7 @@ static struct policydb_compat_info *policydb_lookup_compat(int version)
 	int i;
 	struct policydb_compat_info *info = NULL;
 
-	for (i = 0; i < sizeof(policydb_compat)/sizeof(*info); i++) {
+	for (i = 0; i < ARRAY_SIZE(policydb_compat); i++) {
 		if (policydb_compat[i].version == version) {
 			info = &policydb_compat[i];
 			break;