diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-03-20 02:52:17 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-20 02:52:17 +0100 |
| commit | 09f61cdbb32a9d812c618d3922db533542736bb0 (patch) | |
| tree | 90d8e9163e269d0ed9e01f0dac500316014b88c5 /security | |
| parent | TOMOYO: Return error if fails to delete a domain (diff) | |
| parent | AppArmor: Fix location of const qualifier on generated string tables (diff) | |
| download | linux-09f61cdbb32a9d812c618d3922db533542736bb0.tar.xz linux-09f61cdbb32a9d812c618d3922db533542736bb0.zip | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile index 7e14edd9ec60..806bd19af7f2 100644 --- a/security/apparmor/Makefile +++ b/security/apparmor/Makefile @@ -15,7 +15,7 @@ clean-files := capability_names.h rlim_names.h # to # [1] = "dac_override", quiet_cmd_make-caps = GEN $@ -cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\ +cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\ sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \ -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\ echo "};" >> $@ @@ -43,7 +43,7 @@ cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\ # to # #define AA_FS_RLIMIT_MASK "fsize stack" quiet_cmd_make-rlim = GEN $@ -cmd_make-rlim = echo "static const char const *rlim_names[RLIM_NLIMITS] = {" \ +cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ > $@ ;\ sed $< >> $@ -r -n \ -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\ |