From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Maxim Levitsky <maximlevitsky@gmail•com>
Subject: linux-next: build failure after merge of the final tree (mtd related)
Date: Mon, 1 Mar 2010 20:48:44 +1100 [thread overview]
Message-ID: <20100301204844.68915148.sfr@canb.auug.org.au> (raw)
Hi David,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/mtd/nand/r852.o: In function `.sm_sector_valid':
(.text+0x5c70): multiple definition of `.sm_sector_valid'
drivers/mtd/nand/sm_common.o:(.text+0x3c8): first defined here
drivers/mtd/nand/r852.o: In function `.sm_block_erased':
(.text+0x50dc): multiple definition of `.sm_block_erased'
drivers/mtd/nand/sm_common.o:(.text+0x2bc): first defined here
drivers/mtd/nand/r852.o: In function `.sm_block_valid':
(.text+0x5be8): multiple definition of `.sm_block_valid'
drivers/mtd/nand/sm_common.o:(.text+0x340): first defined here
Caused by commit 9fc51a37a8da84618df7584cad67c078317f6720 ("mtd: common
module for smartmedia/xD support") from the mtd tree.
I applied the following patch for today.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Mar 2010 20:44:57 +1100
Subject: [PATCH] mtd: declare inline functions static
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/mtd/nand/sm_common.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/sm_common.h b/drivers/mtd/nand/sm_common.h
index 7c03314..18284f5 100644
--- a/drivers/mtd/nand/sm_common.h
+++ b/drivers/mtd/nand/sm_common.h
@@ -39,17 +39,17 @@ struct sm_oob {
extern int sm_register_device(struct mtd_info *mtd);
-inline int sm_sector_valid(struct sm_oob *oob)
+static inline int sm_sector_valid(struct sm_oob *oob)
{
return hweight16(oob->data_status) >= 5;
}
-inline int sm_block_valid(struct sm_oob *oob)
+static inline int sm_block_valid(struct sm_oob *oob)
{
return hweight16(oob->block_status) >= 7;
}
-inline int sm_block_erased(struct sm_oob *oob)
+static inline int sm_block_erased(struct sm_oob *oob)
{
static const uint32_t erased_pattern[4] = {
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
--
1.7.0
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-03-01 9:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 9:48 Stephen Rothwell [this message]
2010-03-01 14:59 ` linux-next: build failure after merge of the final tree (mtd related) David Woodhouse
2010-03-01 22:39 ` Stephen Rothwell
2010-03-18 14:39 ` David Woodhouse
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=20100301204844.68915148.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dwmw2@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maximlevitsky@gmail$(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