summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-18 08:57:00 +1000
committerJames Morris <jmorris@namei.org>2010-05-18 08:57:00 +1000
commit539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch)
treee603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /scripts
parentba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff)
parent4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff)
downloadlinux-3.10-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.gz
linux-3.10-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.bz2
linux-3.10-539c99fd7fc28f8db257c713c10fb4aceadf8887.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'scripts')
-rw-r--r--scripts/selinux/genheaders/genheaders.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 24626968055..58a12c27870 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
fprintf(fout, "\n");
for (i = 1; i < isids_len; i++) {
- char *s = initial_sid_to_string[i];
+ const char *s = initial_sid_to_string[i];
fprintf(fout, "#define SECINITSID_%s", s);
for (j = 0; j < max(1, 40 - strlen(s)); j++)
fprintf(fout, " ");