linux-next: build failure after merge of the final tree (mtd related)

linux-next: build failure after merge of the final tree (mtd related)

[Stephen Rothwell]

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/

Re: linux-next: build failure after merge of the final tree (mtd related)

[David Woodhouse]

On Mon, 2010-03-01 at 20:48 +1100, Stephen Rothwell wrote:
> 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.

Thanks. Are you happy carrying those until I get back to civilisation on
Monday?

-- 
dwmw2

Re: linux-next: build failure after merge of the final tree (mtd related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

Hi David,

On Mon, 01 Mar 2010 15:59:06 +0100 David Woodhouse <dwmw2@infradead.org> wrote:
>
> Thanks. Are you happy carrying those until I get back to civilisation on
> Monday?

OK, I will keep applying them.  You might want to let Linus know that
your pull request will be relatively late, though, as he has threatened a
short merge window ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the final tree (mtd related)

[David Woodhouse]

On Tue, 2010-03-02 at 09:39 +1100, Stephen Rothwell wrote:
> Hi David,
> 
> On Mon, 01 Mar 2010 15:59:06 +0100 David Woodhouse <dwmw2@infradead.org> wrote:
> >
> > Thanks. Are you happy carrying those until I get back to civilisation on
> > Monday?
> 
> OK, I will keep applying them.  You might want to let Linus know that
> your pull request will be relatively late, though, as he has threatened a
> short merge window ...

Hm, seems that didn't suffice; he still ignored the pull request which I
sent last Monday as promised.

Oh well, not the end of the world if it waits till 2.6.35.

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation