diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /security/smack/smack.h | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
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; |