diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /security/smack/smack.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 4a4477f5afdc..31dce559595a 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h | |||
| @@ -178,6 +178,7 @@ u32 smack_to_secid(const char *); | |||
| 178 | extern int smack_cipso_direct; | 178 | extern int smack_cipso_direct; |
| 179 | extern int smack_net_nltype; | 179 | extern int smack_net_nltype; |
| 180 | extern char *smack_net_ambient; | 180 | extern char *smack_net_ambient; |
| 181 | extern char *smack_onlycap; | ||
| 181 | 182 | ||
| 182 | extern struct smack_known *smack_known; | 183 | extern struct smack_known *smack_known; |
| 183 | extern struct smack_known smack_known_floor; | 184 | extern struct smack_known smack_known_floor; |