diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 10:42:20 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 10:42:20 +1000 |
commit | b0c8be1534b4e3c49a675a0ef1eb81b22800257f (patch) | |
tree | ba887e54fbcbbe32d72741d612cb538672367b3e /kernel | |
parent | 687139f03799bc072627c5c636127e2fc71a45d5 (diff) | |
parent | 919bb328b0209612b2ba1d966f4289f01dc9a808 (diff) |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/bpf/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index fddcae801724..9bbd33497d3d 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -429,7 +429,7 @@ static int bpf_parse_options(char *data, struct bpf_mount_opts *opts) static int bpf_fill_super(struct super_block *sb, void *data, int silent) { - static struct tree_descr bpf_rfiles[] = { { "" } }; + static const struct tree_descr bpf_rfiles[] = { { "" } }; struct bpf_mount_opts opts; struct inode *inode; int ret; |