diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-05-26 14:51:00 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-05-26 14:51:00 -0400 |
| commit | d0367a508af9cf97beb202935bb9ad8883d30cd1 (patch) | |
| tree | 12222635742742c8536b7a2d3188c8c174c6caab /fs | |
| parent | 68743082b560067e3e93eab8b2568f238e486865 (diff) | |
| download | kernel_samsung_espresso10-d0367a508af9cf97beb202935bb9ad8883d30cd1.zip kernel_samsung_espresso10-d0367a508af9cf97beb202935bb9ad8883d30cd1.tar.gz kernel_samsung_espresso10-d0367a508af9cf97beb202935bb9ad8883d30cd1.tar.bz2 | |
nfs: fix build error in nfsroot with initconst
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>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfsroot.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"}, |