Merge ../torvalds-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 0e1352a555c8..e59da6398d44 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -376,7 +376,7 @@ static ssize_t selinux_transaction_write(struct file *file, const char __user *b
         char *data;
         ssize_t rv;
 
-        if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino])
+        if (ino >= ARRAY_SIZE(write_op) || !write_op[ino])
                 return -EINVAL;
 
         data = simple_transaction_get(file, buf, size);
@@ -1161,7 +1161,7 @@ static int sel_make_avc_files(struct dentry *dir)
 #endif
         };
 
-        for (i = 0; i < sizeof (files) / sizeof (files[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(files); i++) {
                 struct inode *inode;
                 struct dentry *dentry;