Commit d0367a50 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Trond Myklebust

nfs: fix build error in nfsroot with initconst

fix build error with latest kbuild adjustments to initconst.

The commit a447c093 ("vfs: Use
const for kernel parser table") changed:

    static match_table_t __initdata tokens = {
to
    static match_table_t __initconst tokens = {

But the missing const causes popwerpc to fail with latest
updates to __initconst like this:

fs/nfs/nfsroot.c:400: error: __setup_str_nfs_root_setup causes a section type conflict
fs/nfs/nfsroot.c:400: error: __setup_str_nfs_root_setup causes a section type conflict

The bug is only present with kbuild-next.
Following patch has been build tested.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 68743082
...@@ -129,7 +129,7 @@ enum { ...@@ -129,7 +129,7 @@ enum {
Opt_err Opt_err
}; };
static match_table_t __initconst tokens = { static const match_table_t tokens __initconst = {
{Opt_port, "port=%u"}, {Opt_port, "port=%u"},
{Opt_rsize, "rsize=%u"}, {Opt_rsize, "rsize=%u"},
{Opt_wsize, "wsize=%u"}, {Opt_wsize, "wsize=%u"},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment