Skip to content

Commit

Permalink
nfs: fix build error in nfsroot with initconst
Browse files Browse the repository at this point in the history
fix build error with latest kbuild adjustments to initconst.

The commit a447c09 ("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: Sam Ravnborg <[email protected]>
Cc: Steven Whitehouse <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Acked-by: Jan Beulich <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
  • Loading branch information
sravnborg authored and Trond Myklebust committed May 26, 2009
1 parent 6874308 commit d0367a5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfs/nfsroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ enum {
Opt_err
};

static match_table_t __initconst tokens = {
static const match_table_t tokens __initconst = {
{Opt_port, "port=%u"},
{Opt_rsize, "rsize=%u"},
{Opt_wsize, "wsize=%u"},
Expand Down

0 comments on commit d0367a5

Please sign in to comment.