From: Sam Ravnborg <sam@ravnborg•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Trond Myklebust <Trond.Myklebust@netapp•com>
Cc: linux-next@vger•kernel.org, Jan Beulich <jbeulich@novell•com>,
Steven Whitehouse <swhiteho@redhat•com>
Subject: [PATCH] nfs: fix build error in nfsroot with initconst
Date: Tue, 5 May 2009 13:11:14 +0200 [thread overview]
Message-ID: <20090505111114.GA16497@uranus.ravnborg.org> (raw)
In-Reply-To: <20090505111712.ae4649b3.sfr@canb.auug.org.au>
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 <sam@ravnborg•org>
Cc: Steven Whitehouse <swhiteho@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>
---
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"},
next prev parent reply other threads:[~2009-05-05 11:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-05 1:17 linux-next: kbuild tree build failure Stephen Rothwell
2009-05-05 6:35 ` Jan Beulich
2009-05-05 6:43 ` Sam Ravnborg
2009-05-05 7:04 ` Jan Beulich
2009-05-05 11:11 ` Sam Ravnborg [this message]
2009-05-05 12:48 ` [PATCH] nfs: fix build error in nfsroot with initconst Jan Beulich
2009-05-06 3:32 ` Stephen Rothwell
2009-05-06 4:40 ` Sam Ravnborg
2009-05-06 13:45 ` Trond Myklebust
2009-05-20 1:30 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090505111114.GA16497@uranus.ravnborg.org \
--to=sam@ravnborg$(echo .)org \
--cc=Trond.Myklebust@netapp$(echo .)com \
--cc=jbeulich@novell$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=swhiteho@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox