[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080724235549.GB19310@cs181140183.pp.htv.fi>
Date: Fri, 25 Jul 2008 02:55:49 +0300
From: Adrian Bunk <bunk@...nel.org>
To: Steven Whitehouse <swhiteho@...hat.com>,
Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org,
Trond Myklebust <Trond.Myklebust@...app.com>
Subject: [2.6 patch] fix fs/nfs/nfsroot.c compilation
This patch fixes the following compile error caused by
commit f9247273cb69ba101877e946d2d83044409cc8c5
(UFS: add const to parser token tabl):
<-- snip -->
...
CC fs/nfs/nfsroot.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/nfs/nfsroot.c:130: error: tokens causes a section type conflict
make[3]: *** [fs/nfs/nfsroot.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@...nel.org>
---
75623185c608ee0d223a0076ea8237edcb8ac18f
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 46763d1..8478fc2 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -127,7 +127,7 @@ enum {
Opt_err
};
-static match_table_t __initdata tokens = {
+static match_table_t __initconst tokens = {
{Opt_port, "port=%u"},
{Opt_rsize, "rsize=%u"},
{Opt_wsize, "wsize=%u"},
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists