diff options
| author | James Morris <jmorris@namei.org> | 2010-03-08 20:46:47 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-08 20:46:47 -0500 |
| commit | c43a7523470dc2d9947fa114a0b54317975d4c04 (patch) | |
| tree | 30a72ed1e9079f19b814263197761820f57c39ce /security/selinux/hooks.c | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | 634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 5feecb41009d..63c2d36d55ab 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -323,7 +323,7 @@ extern int ss_initialized; | |||
| 323 | 323 | ||
| 324 | /* The file system's label must be initialized prior to use. */ | 324 | /* The file system's label must be initialized prior to use. */ |
| 325 | 325 | ||
| 326 | static char *labeling_behaviors[6] = { | 326 | static const char *labeling_behaviors[6] = { |
| 327 | "uses xattr", | 327 | "uses xattr", |
| 328 | "uses transition SIDs", | 328 | "uses transition SIDs", |
| 329 | "uses task SIDs", | 329 | "uses task SIDs", |