diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 14:44:21 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 14:44:21 (GMT) |
| commit | 992ab12ac390a8b98b45d03f617481e6265811c0 (patch) | |
| tree | e2d1b561679a9811f1ddbca31b7bd35d45a3f7e9 | |
| parent | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 (diff) | |
| parent | 2e1479d95d02b43660fe03ab2c595ec9751a6f97 (diff) | |
| download | linux-fsl-qoriq-992ab12ac390a8b98b45d03f617481e6265811c0.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
make selinux_parse_opts_str() static
| -rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4bf4807..41a049f 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb, mutex_unlock(&newsbsec->lock); } -int selinux_parse_opts_str(char *options, struct security_mnt_opts *opts) +static int selinux_parse_opts_str(char *options, + struct security_mnt_opts *opts) { char *p; char *context = NULL, *defcontext = NULL; |