Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-microblaze.git] / security / smack / smackfs.c

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 366b835..f6482e5 100644 (file)
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2855,7 +2855,7 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent)
        int rc;
        struct inode *root_inode;
 
-       static struct tree_descr smack_files[] = {
+       static const struct tree_descr smack_files[] = {
                [SMK_LOAD] = {
                        "load", &smk_load_ops, S_IRUGO|S_IWUSR},
                [SMK_CIPSO] = {