linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the final tree
@ 2011-03-28  3:44 Stephen Rothwell
  2011-03-28 22:24 ` [PATCH] memstick: make enable_dma less generic in r592 Stephen Rothwell
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-28  3:44 UTC (permalink / raw)
  To: Linus, Andrew Morton; +Cc: linux-next, linux-kernel, Maxim Levitsky

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

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here

Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
card reader").

enable_dma() is also defined in a few other architectures including x86
(presumably asm/dma.h does not get included there).

I just reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH] memstick: make enable_dma less generic in r592
  2011-03-28  3:44 linux-next: build failure after merge of the final tree Stephen Rothwell
@ 2011-03-28 22:24 ` Stephen Rothwell
  2011-03-28 22:48   ` Stephen Rothwell
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-28 22:24 UTC (permalink / raw)
  To: Linus, Andrew Morton
  Cc: linux-next, linux-kernel, Maxim Levitsky, Alex Dubov, FUJITA Tomonori

On Mon, 28 Mar 2011 14:44:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
> 
> Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
> card reader").
> 
> enable_dma() is also defined in a few other architectures including x86
> (presumably asm/dma.h does not get included there).
> 
> I just reverted that commit for today.

I will, instead, apply this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Mar 2011 09:12:53 +1100
Subject: [PATCH] memstick: make enable_dma less generic in r592

Fixes this build error:

drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
---
 drivers/memstick/host/r592.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 767406c..ecf3d7d 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -23,7 +23,7 @@
 #include <linux/swab.h>
 #include "r592.h"
 
-static int enable_dma = 1;
+static int r592_enable_dma = 1;
 static int debug;
 
 static const char *tpc_names[] = {
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
 /* Test if hardware supports DMA */
 static void r592_check_dma(struct r592_device *dev)
 {
-	dev->dma_capable = enable_dma &&
+	dev->dma_capable = r592_enable_dma &&
 		(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
 			R592_FIFO_DMA_SETTINGS_CAP);
 }
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
 module_init(r592_module_init);
 module_exit(r592_module_exit);
 
-module_param(enable_dma, bool, S_IRUGO);
+module_param_named(r592_enable_dma, enable_dma, bool, S_IRUGO);
 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug level (0-3)");
-- 
1.7.4.1


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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] memstick: make enable_dma less generic in r592
  2011-03-28 22:24 ` [PATCH] memstick: make enable_dma less generic in r592 Stephen Rothwell
@ 2011-03-28 22:48   ` Stephen Rothwell
  2011-03-28 23:10     ` [PATCH v2] " Stephen Rothwell
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-28 22:48 UTC (permalink / raw)
  To: Linus, Andrew Morton
  Cc: linux-next, linux-kernel, Maxim Levitsky, Alex Dubov, FUJITA Tomonori

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

Hi all,

ignore this ...  I will send a fixed version soon, sorry

On Tue, 29 Mar 2011 09:24:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 28 Mar 2011 14:44:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> > 
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> > arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
> > 
> > Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
> > card reader").
> > 
> > enable_dma() is also defined in a few other architectures including x86
> > (presumably asm/dma.h does not get included there).
> > 
> > I just reverted that commit for today.
> 
> I will, instead, apply this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 29 Mar 2011 09:12:53 +1100
> Subject: [PATCH] memstick: make enable_dma less generic in r592
> 
> Fixes this build error:
> 
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: Alex Dubov <oakad@yahoo.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> ---
>  drivers/memstick/host/r592.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 767406c..ecf3d7d 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -23,7 +23,7 @@
>  #include <linux/swab.h>
>  #include "r592.h"
>  
> -static int enable_dma = 1;
> +static int r592_enable_dma = 1;
>  static int debug;
>  
>  static const char *tpc_names[] = {
> @@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
>  /* Test if hardware supports DMA */
>  static void r592_check_dma(struct r592_device *dev)
>  {
> -	dev->dma_capable = enable_dma &&
> +	dev->dma_capable = r592_enable_dma &&
>  		(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
>  			R592_FIFO_DMA_SETTINGS_CAP);
>  }
> @@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
>  module_init(r592_module_init);
>  module_exit(r592_module_exit);
>  
> -module_param(enable_dma, bool, S_IRUGO);
> +module_param_named(r592_enable_dma, enable_dma, bool, S_IRUGO);
>  MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
>  module_param(debug, int, S_IRUGO | S_IWUSR);
>  MODULE_PARM_DESC(debug, "Debug level (0-3)");
> -- 
> 1.7.4.1
> 
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/


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

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v2] memstick: make enable_dma less generic in r592
  2011-03-28 22:48   ` Stephen Rothwell
@ 2011-03-28 23:10     ` Stephen Rothwell
  2011-03-28 23:21       ` Maxim Levitsky
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-28 23:10 UTC (permalink / raw)
  To: Linus, Andrew Morton
  Cc: linux-next, linux-kernel, Maxim Levitsky, Alex Dubov, FUJITA Tomonori

Fixes this build error:

drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
---
 drivers/memstick/host/r592.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

v2: get the arguments to module_param_named() in the right order (blush :-))

This has been applied to linux-next today.

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 767406c..700d420 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -23,7 +23,7 @@
 #include <linux/swab.h>
 #include "r592.h"
 
-static int enable_dma = 1;
+static int r592_enable_dma = 1;
 static int debug;
 
 static const char *tpc_names[] = {
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
 /* Test if hardware supports DMA */
 static void r592_check_dma(struct r592_device *dev)
 {
-	dev->dma_capable = enable_dma &&
+	dev->dma_capable = r592_enable_dma &&
 		(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
 			R592_FIFO_DMA_SETTINGS_CAP);
 }
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
 module_init(r592_module_init);
 module_exit(r592_module_exit);
 
-module_param(enable_dma, bool, S_IRUGO);
+module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
 MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug level (0-3)");
-- 
1.7.4.1

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] memstick: make enable_dma less generic in r592
  2011-03-28 23:10     ` [PATCH v2] " Stephen Rothwell
@ 2011-03-28 23:21       ` Maxim Levitsky
  0 siblings, 0 replies; 5+ messages in thread
From: Maxim Levitsky @ 2011-03-28 23:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linus, Andrew Morton, linux-next, linux-kernel, Alex Dubov,
	FUJITA Tomonori

On Tue, 2011-03-29 at 10:10 +1100, Stephen Rothwell wrote:
> Fixes this build error:
> 
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: Alex Dubov <oakad@yahoo.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> ---
>  drivers/memstick/host/r592.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> v2: get the arguments to module_param_named() in the right order (blush :-))
> 
> This has been applied to linux-next today.
> 
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 767406c..700d420 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -23,7 +23,7 @@
>  #include <linux/swab.h>
>  #include "r592.h"
>  
> -static int enable_dma = 1;
> +static int r592_enable_dma = 1;
>  static int debug;
>  
>  static const char *tpc_names[] = {
> @@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
>  /* Test if hardware supports DMA */
>  static void r592_check_dma(struct r592_device *dev)
>  {
> -	dev->dma_capable = enable_dma &&
> +	dev->dma_capable = r592_enable_dma &&
>  		(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
>  			R592_FIFO_DMA_SETTINGS_CAP);
>  }
> @@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
>  module_init(r592_module_init);
>  module_exit(r592_module_exit);
>  
> -module_param(enable_dma, bool, S_IRUGO);
> +module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
>  MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
>  module_param(debug, int, S_IRUGO | S_IWUSR);
>  MODULE_PARM_DESC(debug, "Debug level (0-3)");
> -- 
> 1.7.4.1
> 


Sorry for this name clash. I didn't expect it.
Thanks for spotting this.

-- 
Best regards,
        Maxim Levitsky

Visit my blog: http://maximlevitsky.wordpress.com
Warning: Above blog contains rants.

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-28 23:21 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-28  3:44 linux-next: build failure after merge of the final tree Stephen Rothwell
2011-03-28 22:24 ` [PATCH] memstick: make enable_dma less generic in r592 Stephen Rothwell
2011-03-28 22:48   ` Stephen Rothwell
2011-03-28 23:10     ` [PATCH v2] " Stephen Rothwell
2011-03-28 23:21       ` Maxim Levitsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).