diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /security/apparmor/match.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'security/apparmor/match.c')
| -rw-r--r-- | security/apparmor/match.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/match.c b/security/apparmor/match.c index 5cb4dc1f6992..94de6b4907c8 100644 --- a/security/apparmor/match.c +++ b/security/apparmor/match.c | |||
| @@ -194,8 +194,8 @@ void aa_dfa_free_kref(struct kref *kref) | |||
| 194 | * @flags: flags controlling what type of accept tables are acceptable | 194 | * @flags: flags controlling what type of accept tables are acceptable |
| 195 | * | 195 | * |
| 196 | * Unpack a dfa that has been serialized. To find information on the dfa | 196 | * Unpack a dfa that has been serialized. To find information on the dfa |
| 197 | * format look in Documentation/apparmor.txt | 197 | * format look in Documentation/security/apparmor.txt |
| 198 | * Assumes the dfa @blob stream has been aligned on a 8 byte boundry | 198 | * Assumes the dfa @blob stream has been aligned on a 8 byte boundary |
| 199 | * | 199 | * |
| 200 | * Returns: an unpacked dfa ready for matching or ERR_PTR on failure | 200 | * Returns: an unpacked dfa ready for matching or ERR_PTR on failure |
| 201 | */ | 201 | */ |