Subject: Re: [PATCH] nfs: fix build error in nfsroot with initconst

From: "Jan Beulich" <[email-masked]>
Date: Tue, 05 May 2009 13:48:34 +0100

Acked-by: Jan Beulich <[email-masked]>

>>> Sam Ravnborg <[email-masked]> 05.05.09 13:11 >>>
fix build error with latest kbuild adjustments to initconst.

The commit a447c0932445f92ce6f4c1bd020f62c5097a7842 ("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-masked]>
Cc: Steven Whitehouse <[email-masked]>
Cc: Stephen Rothwell <[email-masked]>
---

Please apply this either to your -next tree or preferably upstream.

	Sam

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index d9ef602..e3ed590 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -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"},