diff options
author | 2009-03-27 17:19:16 -0700 | |
---|---|---|
committer | 2009-03-27 17:19:16 -0700 | |
commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /security/selinux/include/objsec.h | |
parent | sparc64: Fix MM refcount check in smp_flush_tlb_pending(). (diff) | |
parent | i915: fix wrong 'size_t' format string (diff) | |
download | linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'security/selinux/include/objsec.h')
-rw-r--r-- | security/selinux/include/objsec.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 3cc45168f674..c4e062336ef3 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -60,9 +60,7 @@ struct superblock_security_struct { u32 def_sid; /* default SID for labeling */ u32 mntpoint_sid; /* SECURITY_FS_USE_MNTPOINT context for files */ unsigned int behavior; /* labeling behavior */ - unsigned char initialized; /* initialization flag */ unsigned char flags; /* which mount options were specified */ - unsigned char proc; /* proc fs */ struct mutex lock; struct list_head isec_head; spinlock_t isec_lock; |