* linux-next: build failure after merge of the moduleh tree
From: Stephen Rothwell @ 2011-09-30 4:50 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Linus Walleij
Hi Paul,
After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/pinctrl/core.c:80:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:80:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:80:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:86:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:86:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:86:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:152:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:152:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:152:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:590:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:590:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:590:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:614:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:614:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:614:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c: In function 'pin_request':
drivers/pinctrl/pinmux.c:143:2: error: implicit declaration of function 'try_module_get' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinmux.c: In function 'pin_free':
drivers/pinctrl/pinmux.c:206:2: error: implicit declaration of function 'module_put' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinmux.c: At top level:
drivers/pinctrl/pinmux.c:234:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:234:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:234:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:257:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:257:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:257:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:754:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:754:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:754:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:779:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:779:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:779:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:813:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:813:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:813:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:837:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:837:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:837:1: warning: parameter names (without types) in function declaration [enabled by default]
Caused by commit 05f20c997d73 ("drivers: create a pin control subsystem
v8"), revelealed by the module.h split.
I have applied the following patch for today (Linus, the
drivers/pinctrl/pinmux.c part of this can be applied to your tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 14:39:04 +1000
Subject: [PATCH] pinctrl: EXPORT_SYMBOL needs export.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/pinctrl/core.c | 1 +
drivers/pinctrl/pinmux.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 4229628..f9263b2 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -12,6 +12,7 @@
#define pr_fmt(fmt) "pinctrl core: " fmt
#include <linux/kernel.h>
+#include <linux/export.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 37803f0..6b28f2b 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -12,6 +12,7 @@
#define pr_fmt(fmt) "pinmux core: " fmt
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: manual merge of the pinctrl tree with the arm and arm-soc trees
From: Stephen Rothwell @ 2011-09-30 4:20 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel, Jon Medhurst, Arnd Bergmann
Hi Linus,
Today's linux-next merge of the pinctrl tree got conflicts in
arch/arm/mach-u300/Kconfig and arch/arm/mach-u300/core.c between commit
cc890cd78acd ("ARM: 7083/1: rewrite U300 GPIO to use gpiolib") from the
arm tree, commits c21d2319efcd ("mach-u300: retire AVE device") and
d70a5969e9d5 ("ARM: mach-u300: Setup consistent dma size at boot time")
from the arm-soc tree and commit bb41f2392a5a ("pinmux: add a driver for
the U300 pinmux") from the pinctrl tree.
I did the obvious (but maybe wrong - see below) fixups and can carry the
fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-u300/Kconfig
index 39e077e,449fd6a..0000000
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -6,7 -6,8 +6,9 @@@ comment "ST-Ericsson Mobile Platform Pr
config MACH_U300
bool "U300"
+ select GPIO_U300
+ select PINCTRL
+ select PINMUX_U300
comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
diff --cc arch/arm/mach-u300/core.c
index 2f1d758,2f5929b..0000000
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -25,7 -25,8 +25,9 @@@
#include <linux/err.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/fsmc.h>
+#include <linux/dma-mapping.h>
+ #include <linux/pinctrl/machine.h>
+ #include <linux/pinctrl/pinmux.h>
#include <asm/types.h>
#include <asm/setup.h>
@@@ -1600,6 -1719,8 +1676,7 @@@ static struct platform_device *platform
&gpio_device,
&nand_device,
&wdog_device,
- &ave_device,
+ &pinmux_device,
};
/*
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree
From: Paul Gortmaker @ 2011-09-30 3:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110930130550.2f6597491fa1b59f3be839e0@canb.auug.org.au>
[Re: linux-next: build failure after merge of the final tree] On 30/09/2011 (Fri 13:05) Stephen Rothwell wrote:
> Hi Paul,
>
> On Thu, 29 Sep 2011 22:40:59 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> >
> > On Thu, Sep 29, 2011 at 9:12 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the final tree, today's linux-next build (avr32 allnoconfig)
> > > failed like this:
> > >
> > > arch/avr32/mach-at32ap/pio.c: In function 'pio_probe':
> > > arch/avr32/mach-at32ap/pio.c:401: error: 'THIS_MODULE' undeclared (first use in this function)
> > >
> > > Probably revealed by the module.h split up. I guess it needs export.h
> > > included.
> >
> > Since export.h does not exist for most people, I'm OK adding it
> > in instances like this as a post-merge patch.
>
> I had another look at this and it turns out that export.h is already
> included, but only conditionally. I guess the include just needs moving
> to the top of the file.
Agreed. A side effect of my "find a linux include and add another below
it" script. These conditional includes (which are dubious to begin
with) seem to always get caught by that. I'll fix this up and make it
unconditional for tomorrow.
Thanks,
Paul.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 3:05 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
In-Reply-To: <CAP=VYLoycp1aUYGxQkb+U70CFRvu=nz6pdd63Zapn7a-+gXWVw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 957 bytes --]
Hi Paul,
On Thu, 29 Sep 2011 22:40:59 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> On Thu, Sep 29, 2011 at 9:12 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the final tree, today's linux-next build (avr32 allnoconfig)
> > failed like this:
> >
> > arch/avr32/mach-at32ap/pio.c: In function 'pio_probe':
> > arch/avr32/mach-at32ap/pio.c:401: error: 'THIS_MODULE' undeclared (first use in this function)
> >
> > Probably revealed by the module.h split up. I guess it needs export.h
> > included.
>
> Since export.h does not exist for most people, I'm OK adding it
> in instances like this as a post-merge patch.
I had another look at this and it turns out that export.h is already
included, but only conditionally. I guess the include just needs moving
to the top of the file.
--
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
* Re: linux-next: build failure after merge of the final tree
From: Yoshihiro Shimoda @ 2011-09-30 2:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paul Gortmaker, Paul Mundt,
David S. Miller, netdev
In-Reply-To: <20110930113811.c2fa2d532dfa799a49c146f4@canb.auug.org.au>
Hi Stephen,
Thank you for the report.
I will submit a patch for the issue soon.
Since I used the net-next.git, the build failure didn't happen.
This is because that the linux/device.h of the net-next.git has "#include <linux/module.h>".
But, I was wrong to remove "#include <linux/module.h>" in the sh_eth.{c,h}.
Thanks,
Yoshihiro Shimoda
2011/09/30 10:38, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, the next-20110929 build (various sh configs)
> failed like this:
>
> drivers/net/ethernet/renesas/sh_eth.c:601: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/net/ethernet/renesas/sh_eth.c:1970: error: expected declaration specifiers or '...' before string constant
> drivers/net/ethernet/renesas/sh_eth.c:1970: warning: data definition has no type or storage class
> drivers/net/ethernet/renesas/sh_eth.c:1970: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/net/ethernet/renesas/sh_eth.c:1970: warning: function declaration isn't a prototype
> drivers/net/ethernet/renesas/sh_eth.c:1971: error: expected declaration specifiers or '...' before string constant
> drivers/net/ethernet/renesas/sh_eth.c:1971: warning: data definition has no type or storage class
> drivers/net/ethernet/renesas/sh_eth.c:1971: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
> drivers/net/ethernet/renesas/sh_eth.c:1971: warning: function declaration isn't a prototype
> drivers/net/ethernet/renesas/sh_eth.c:1972: error: expected declaration specifiers or '...' before string constant
> drivers/net/ethernet/renesas/sh_eth.c:1972: warning: data definition has no type or storage class
> drivers/net/ethernet/renesas/sh_eth.c:1972: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> drivers/net/ethernet/renesas/sh_eth.c:1972: warning: function declaration isn't a prototype
>
> Presumbly revealed by the module.h split up. This file needs to include module.h.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree
From: Paul Gortmaker @ 2011-09-30 2:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110930111241.829ed0ada733516b71ab120d@canb.auug.org.au>
On Thu, Sep 29, 2011 at 9:12 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (avr32 allnoconfig)
> failed like this:
>
> arch/avr32/mach-at32ap/pio.c: In function 'pio_probe':
> arch/avr32/mach-at32ap/pio.c:401: error: 'THIS_MODULE' undeclared (first use in this function)
>
> Probably revealed by the module.h split up. I guess it needs export.h
> included.
Since export.h does not exist for most people, I'm OK adding it
in instances like this as a post-merge patch. For instances where
it is obvious that the full module.h is required, I'd rather the originator
of the new module dependent code simply add the required module.h
themselves. (I think this is consistent with what Stephen has been
recommending to people on a case-by-case basis anyway).
I can/will temporarily add the module.h cases to the post-merge queue
too, but my intention is to move as many of these post-merge commits
off to the sub-maintainers as possible.
P.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* Re: [PATCH] intel_sst: fix compile error
From: Vinod Koul @ 2011-09-30 2:34 UTC (permalink / raw)
To: Lu Guanqun
Cc: gregkh, sfr, linux-next, linux-kernel, alan, fengguang.wu, devel,
paul.gortmaker
In-Reply-To: <1317350135-15055-1-git-send-email-guanqun.lu@intel.com>
On Fri, 2011-09-30 at 10:35 +0800, Lu Guanqun wrote:
> include module.h to fix the following compile errors:
>
> drivers/staging/intel_sst/intelmid.c:52: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:52: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:52: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/staging/intel_sst/intelmid.c:52: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:53: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:53: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:53: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/staging/intel_sst/intelmid.c:53: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:54: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:54: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:54: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/staging/intel_sst/intelmid.c:54: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:55: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:55: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:55: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/staging/intel_sst/intelmid.c:55: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:56: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:56: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:56: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
> drivers/staging/intel_sst/intelmid.c:56: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:57: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:57: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:57: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> drivers/staging/intel_sst/intelmid.c:57: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:58: error: expected declaration specifiers or '...' before string constant
> drivers/staging/intel_sst/intelmid.c:58: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:58: warning: type defaults to 'int' in declaration of 'MODULE_SUPPORTED_DEVICE'
> drivers/staging/intel_sst/intelmid.c:58: warning: function declaration isn't a prototype
> drivers/staging/intel_sst/intelmid.c:64: error: expected ')' before 'int'
> drivers/staging/intel_sst/intelmid.c:65: error: expected ')' before string constant
> drivers/staging/intel_sst/intelmid.c:66: error: expected ')' before numeric constant
> drivers/staging/intel_sst/intelmid.c:67: error: expected ')' before string constant
> drivers/staging/intel_sst/intelmid.c:461: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:461: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/staging/intel_sst/intelmid.c:461: warning: parameter names (without types) in function declaration
> drivers/staging/intel_sst/intelmid.c:475: warning: data definition has no type or storage class
> drivers/staging/intel_sst/intelmid.c:475: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/staging/intel_sst/intelmid.c:475: warning: parameter names (without types) in function declaration
> drivers/staging/intel_sst/intelmid.c: In function 'snd_intelmad_probe':
> drivers/staging/intel_sst/intelmid.c:859: error: 'THIS_MODULE' undeclared (first use in this function)
> drivers/staging/intel_sst/intelmid.c:859: error: (Each undeclared identifier is reported only once
> drivers/staging/intel_sst/intelmid.c:859: error: for each function it appears in.)
> drivers/staging/intel_sst/intelmid.c: At top level:
> drivers/staging/intel_sst/intelmid.c:989: error: 'THIS_MODULE' undeclared here (not in a function)
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
> ---
> drivers/staging/intel_sst/intelmid.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
> index 25656ad..492b660 100644
> --- a/drivers/staging/intel_sst/intelmid.c
> +++ b/drivers/staging/intel_sst/intelmid.c
> @@ -27,6 +27,7 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/io.h>
> #include <linux/platform_device.h>
Thanks I was midway of creating this fix :)
Acked-by: Vinod Koul <vinod.koul@intel.com>
--
~Vinod
^ permalink raw reply
* [PATCH] intel_sst: fix compile error
From: Lu Guanqun @ 2011-09-30 2:35 UTC (permalink / raw)
To: gregkh, sfr
Cc: linux-next, linux-kernel, alan, vinod.koul, fengguang.wu, devel,
paul.gortmaker, Lu Guanqun
In-Reply-To: <20110930112337.02e0ba383ffd12b6d5d24f39@canb.auug.org.au>
include module.h to fix the following compile errors:
drivers/staging/intel_sst/intelmid.c:52: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:52: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:52: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:52: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:53: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:53: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:53: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:53: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:54: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:54: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:54: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:54: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:55: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:55: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:55: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:55: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:56: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:56: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:56: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/staging/intel_sst/intelmid.c:56: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:57: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:57: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:57: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/staging/intel_sst/intelmid.c:57: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:58: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:58: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:58: warning: type defaults to 'int' in declaration of 'MODULE_SUPPORTED_DEVICE'
drivers/staging/intel_sst/intelmid.c:58: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:64: error: expected ')' before 'int'
drivers/staging/intel_sst/intelmid.c:65: error: expected ')' before string constant
drivers/staging/intel_sst/intelmid.c:66: error: expected ')' before numeric constant
drivers/staging/intel_sst/intelmid.c:67: error: expected ')' before string constant
drivers/staging/intel_sst/intelmid.c:461: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:461: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/staging/intel_sst/intelmid.c:461: warning: parameter names (without types) in function declaration
drivers/staging/intel_sst/intelmid.c:475: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:475: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/staging/intel_sst/intelmid.c:475: warning: parameter names (without types) in function declaration
drivers/staging/intel_sst/intelmid.c: In function 'snd_intelmad_probe':
drivers/staging/intel_sst/intelmid.c:859: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/staging/intel_sst/intelmid.c:859: error: (Each undeclared identifier is reported only once
drivers/staging/intel_sst/intelmid.c:859: error: for each function it appears in.)
drivers/staging/intel_sst/intelmid.c: At top level:
drivers/staging/intel_sst/intelmid.c:989: error: 'THIS_MODULE' undeclared here (not in a function)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
drivers/staging/intel_sst/intelmid.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 25656ad..492b660 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -27,6 +27,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/platform_device.h>
--
1.7.6.2
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2011-09-30 1:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Joe Perches
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
Hi all,
After merging the final tree, the next-20110929 build (um defconfig)
failed like this:
In file included from arch/um/os-Linux/sys-i386/registers.c:13:
arch/um/include/shared/user.h:26: error: expected declaration specifiers or '...' before numeric constant
arch/um/include/shared/user.h:26: error: expected declaration specifiers or '...' before numeric constant
arch/um/include/shared/user.h:26: warning: return type defaults to 'int'
arch/um/include/shared/user.h:26: warning: function declaration isn't a prototype
arch/um/include/shared/user.h: In function '__printf':
arch/um/include/shared/user.h:29: error: expected declaration specifiers or '...' before numeric constant
arch/um/include/shared/user.h:29: error: expected declaration specifiers or '...' before numeric constant
arch/um/include/shared/user.h:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'
And it went downhill from here ...
Caused by commit 820b1a71d7a7 ("treewide: use __printf not __attribute__
((format(printf,...)))").
--
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
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:38 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: linux-next, linux-kernel, Paul Gortmaker, Paul Mundt,
David S. Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]
Hi all,
After merging the final tree, the next-20110929 build (various sh configs)
failed like this:
drivers/net/ethernet/renesas/sh_eth.c:601: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/net/ethernet/renesas/sh_eth.c:1970: error: expected declaration specifiers or '...' before string constant
drivers/net/ethernet/renesas/sh_eth.c:1970: warning: data definition has no type or storage class
drivers/net/ethernet/renesas/sh_eth.c:1970: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/net/ethernet/renesas/sh_eth.c:1970: warning: function declaration isn't a prototype
drivers/net/ethernet/renesas/sh_eth.c:1971: error: expected declaration specifiers or '...' before string constant
drivers/net/ethernet/renesas/sh_eth.c:1971: warning: data definition has no type or storage class
drivers/net/ethernet/renesas/sh_eth.c:1971: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/net/ethernet/renesas/sh_eth.c:1971: warning: function declaration isn't a prototype
drivers/net/ethernet/renesas/sh_eth.c:1972: error: expected declaration specifiers or '...' before string constant
drivers/net/ethernet/renesas/sh_eth.c:1972: warning: data definition has no type or storage class
drivers/net/ethernet/renesas/sh_eth.c:1972: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/net/ethernet/renesas/sh_eth.c:1972: warning: function declaration isn't a prototype
Presumbly revealed by the module.h split up. This file needs to include module.h.
--
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
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-next, linux-kernel, Alan Cox, Lu Guanqun, Vinod Koul,
Wu Fengguang, devel, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 4652 bytes --]
Hi all,
After merging the final tree, today's linux-next build (i386 allmodconfig)
failed like this:
drivers/staging/intel_sst/intelmid.c:52: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:52: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:52: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:52: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:53: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:53: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:53: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:53: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:54: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:54: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:54: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:54: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:55: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:55: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:55: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/staging/intel_sst/intelmid.c:55: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:56: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:56: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:56: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/staging/intel_sst/intelmid.c:56: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:57: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:57: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:57: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/staging/intel_sst/intelmid.c:57: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:58: error: expected declaration specifiers or '...' before string constant
drivers/staging/intel_sst/intelmid.c:58: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:58: warning: type defaults to 'int' in declaration of 'MODULE_SUPPORTED_DEVICE'
drivers/staging/intel_sst/intelmid.c:58: warning: function declaration isn't a prototype
drivers/staging/intel_sst/intelmid.c:64: error: expected ')' before 'int'
drivers/staging/intel_sst/intelmid.c:65: error: expected ')' before string constant
drivers/staging/intel_sst/intelmid.c:66: error: expected ')' before numeric constant
drivers/staging/intel_sst/intelmid.c:67: error: expected ')' before string constant
drivers/staging/intel_sst/intelmid.c:461: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:461: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/staging/intel_sst/intelmid.c:461: warning: parameter names (without types) in function declaration
drivers/staging/intel_sst/intelmid.c:475: warning: data definition has no type or storage class
drivers/staging/intel_sst/intelmid.c:475: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/staging/intel_sst/intelmid.c:475: warning: parameter names (without types) in function declaration
drivers/staging/intel_sst/intelmid.c: In function 'snd_intelmad_probe':
drivers/staging/intel_sst/intelmid.c:859: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/staging/intel_sst/intelmid.c:859: error: (Each undeclared identifier is reported only once
drivers/staging/intel_sst/intelmid.c:859: error: for each function it appears in.)
drivers/staging/intel_sst/intelmid.c: At top level:
drivers/staging/intel_sst/intelmid.c:989: error: 'THIS_MODULE' undeclared here (not in a function)
Presumably revealed by the module.h split up. This file needs to include
mofdule.h.
--
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
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:12 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
Hi all,
After merging the final tree, today's linux-next build (avr32 allnoconfig)
failed like this:
arch/avr32/mach-at32ap/pio.c: In function 'pio_probe':
arch/avr32/mach-at32ap/pio.c:401: error: 'THIS_MODULE' undeclared (first use in this function)
Probably revealed by the module.h split up. I guess it needs export.h
included.
--
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
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-09-30 1:05 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: linux-next, linux-kernel, Paul Gortmaker
[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]
Hi all,
After merging the final tree, the next-20110929 build (s390x allmodconfig)
failed like this:
drivers/s390/char/zcore.c:393: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/s390/char/zcore.c:741: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:741: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:741: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/s390/char/zcore.c:741: warning: function declaration isn't a prototype
drivers/s390/char/zcore.c:742: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:742: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:742: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/s390/char/zcore.c:742: warning: function declaration isn't a prototype
drivers/s390/char/zcore.c:743: error: expected declaration specifiers or '...' before string constant
drivers/s390/char/zcore.c:743: warning: data definition has no type or storage class
drivers/s390/char/zcore.c:743: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/s390/char/zcore.c:743: warning: function declaration isn't a prototype
Probably revealed by the module.h split up.
This file needs to include module.h
--
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
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Randy Dunlap @ 2011-09-29 23:16 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers
In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk>
On 09/29/11 15:57, Alan Cox wrote:
> On Thu, 29 Sep 2011 13:35:16 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix build when CONFIG_X86_INTEL_MID is enabled but
>> CONFIG_X86_MRST is not enabled. Fixes this build error:
>
> This looks wrong. Unfortunately until we get kernel.org back its hard to
> do much about it and see what is in all the trees.
>
>> -#ifdef CONFIG_X86_INTEL_MID
>> +#ifdef CONFIG_X86_MRST
>>
>> static inline enum mrst_cpu_type mrst_identify_cpu(void)
>> {
>> return __mrst_cpu_chip;
>> }
>>
>> -#else /* !CONFIG_X86_INTEL_MID */
>> +#else /* !CONFIG_X86_MRST */
>>
>> #define mrst_identify_cpu() (0)
>>
>> -#endif /* !CONFIG_X86_INTEL_MID */
>> +#endif /* !CONFIG_X86_MRST */
>
> This breaks Medfield so NAK
>
> The correct behaviour should be
>
> INTEL_MID defined -> mrst_cpu_chip has meaning
> INTEL_MID not defined -> mrst_identify_chip is 0
>
> your change makes it 0 for Medfield which means it will crash on boot.
arch/x86/platform/mrst/mrst.c -- where __mrst_cpu_chip lives --
is only built when CONFIG_X86_MRST is enabled. You make it sound like
__mrst_cpu_chip needs to live any time that CONFIG_X86_INTEL_MID
is enabled, which sounds reasonable to me.
caveat: given the current linux-next merge trees (as you mentioned).
Does anyone care? If so, please help fix this muck.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Andrew Morton @ 2011-09-29 23:10 UTC (permalink / raw)
To: Alan Cox
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, x86 maintainers,
Andrew Morton, Mathias Nyman
In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk>
On Thu, 29 Sep 2011 23:57:08 +0100
Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> On Thu, 29 Sep 2011 13:35:16 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> > From: Randy Dunlap <rdunlap@xenotime.net>
> >
> > Fix build when CONFIG_X86_INTEL_MID is enabled but
> > CONFIG_X86_MRST is not enabled. Fixes this build error:
>
> This looks wrong. Unfortunately until we get kernel.org back its hard to
> do much about it and see what is in all the trees.
>
> > -#ifdef CONFIG_X86_INTEL_MID
> > +#ifdef CONFIG_X86_MRST
> >
> > static inline enum mrst_cpu_type mrst_identify_cpu(void)
> > {
> > return __mrst_cpu_chip;
> > }
> >
> > -#else /* !CONFIG_X86_INTEL_MID */
> > +#else /* !CONFIG_X86_MRST */
> >
> > #define mrst_identify_cpu() (0)
> >
> > -#endif /* !CONFIG_X86_INTEL_MID */
> > +#endif /* !CONFIG_X86_MRST */
>
> This breaks Medfield so NAK
>
> The correct behaviour should be
>
> INTEL_MID defined -> mrst_cpu_chip has meaning
> INTEL_MID not defined -> mrst_identify_chip is 0
>
> your change makes it 0 for Medfield which means it will crash on boot.
Randy's patch is an attempt to fix Mathias's "x86: rtc: don't register
a platform RTC device for Intel MID platforms".
I'm tempted to do a mass droppage, but then some of the patches might
get forever lost.
I am presently babysitting these x86 patches:
x86-fix-mmap-random-address-range.patch
arch-x86-kernel-e820c-eliminate-bubble-sort-from-sanitize_e820_map.patch
vrtc-change-its-year-offset-from-1960-to-1972.patch
x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms.patch
x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms-fix.patch
mrst-battery-fixes.patch
mrst-battery-fixes-fix.patch
x86mrst-add-mapping-for-bma023.patch
arch-x86-kernel-e820c-quiet-sparse-noise-about-plain-integer-as-null-pointer.patch
arch-x86-kernel-ptracec-quiet-sparse-noise.patch
arch-x86-mm-pageattrc-quiet-sparse-noise-local-functions-should-be-static.patch
x86-tlb-flush-avoid-superflous-leave_mm.patch
Could we please get some x86 maintainers on deck??
^ permalink raw reply
* Re: Please include pin control subsystem in linux-next
From: Stephen Rothwell @ 2011-09-29 23:02 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel, linaro-dev
In-Reply-To: <CACRpkdZcQU6pGrsZ684GvK9T8jD0qVKx6wx8kwdT=Qd7+1QwCw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]
Hi Linus,
On Thu, 29 Sep 2011 14:57:41 +0200 Linus Walleij <linus.walleij@linaro.org> wrote:
>
> my pin control subsystem is maturing, so could you please
> include this in linux-next:
>
> git://git.linaro.org/people/triad/linux-pinctrl.git for-next
I have added your tree from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Alan Cox @ 2011-09-29 22:57 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers
In-Reply-To: <4E84D684.107@xenotime.net>
On Thu, 29 Sep 2011 13:35:16 -0700
Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build when CONFIG_X86_INTEL_MID is enabled but
> CONFIG_X86_MRST is not enabled. Fixes this build error:
This looks wrong. Unfortunately until we get kernel.org back its hard to
do much about it and see what is in all the trees.
> -#ifdef CONFIG_X86_INTEL_MID
> +#ifdef CONFIG_X86_MRST
>
> static inline enum mrst_cpu_type mrst_identify_cpu(void)
> {
> return __mrst_cpu_chip;
> }
>
> -#else /* !CONFIG_X86_INTEL_MID */
> +#else /* !CONFIG_X86_MRST */
>
> #define mrst_identify_cpu() (0)
>
> -#endif /* !CONFIG_X86_INTEL_MID */
> +#endif /* !CONFIG_X86_MRST */
This breaks Medfield so NAK
The correct behaviour should be
INTEL_MID defined -> mrst_cpu_chip has meaning
INTEL_MID not defined -> mrst_identify_chip is 0
your change makes it 0 for Medfield which means it will crash on boot.
^ permalink raw reply
* Re: linux-next: Tree for Sept 29 (kvm)
From: Stephen Rothwell @ 2011-09-29 22:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-next, LKML, kvm@vger.kernel.org, Avi Kivity,
Marcelo Tosatti
In-Reply-To: <4E84CC00.8090702@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
[Just cc'ing the kvm guys ]
On Thu, 29 Sep 2011 12:50:24 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> On 09/28/11 23:57, Stephen Rothwell wrote:
> > Hi all,
> >
> > The linux-next tree is now available from
> > git://github.com/sfrothwell/linux-next.git as a temporary measure while
> > the kernel.org servers are unavailable.
>
>
> kvm build on i386 says:
>
> ERROR: "__udivdi3" [arch/x86/kvm/kvm.ko] undefined!
>
> which is used in somewhere in start_apic_timer() (probably the divide :).
>
>
> --
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
--
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
* Re: linux-next: manual merge of the moduleh tree with the net tree
From: Paul Gortmaker @ 2011-09-29 20:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Pavel Roskin, John W. Linville,
David Miller, netdev
In-Reply-To: <20110928163406.843e4be56b42dca280d85489@canb.auug.org.au>
[linux-next: manual merge of the moduleh tree with the net tree] On 28/09/2011 (Wed 16:34) Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/net/wireless/ath/ath5k/debug.c between commit 931be260ed54
> ("ath5k: clean up base.h and its use") from the net tree and commits
> 9ec3f961e31a ("drivers/net: Add export.h to files using
> EXPORT_SYMBOL/THIS_MODULE") and 0cccb17382f1 ("drivers/net: Add
> moduleparam.h to drivers as required") from the moduleh tree.
>
> I fixed it up (see below) and can carry the fix as necessary. (I am
> pretty sure that this file doesn't need module.h, but not completely).
The conflict is gone, but you were correct in your original assessment
that the module.h was no longer needed. I've added this to the
post-merge queue of patches.
Thanks,
Paul.
>From 13a6768b382b3d2f96b9caa9fa6df1f2f7f3aeb6 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 29 Sep 2011 16:37:30 -0400
Subject: [PATCH] drivers/net: wireless/ath/ath5k/debug.c does not need
module.h
It only has module_param and EXPORT_SYMBOL, so now that export.h
is in scope at the same time as the recent ath5k update, we can
delete this module.h include.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index d2bdd90..f542b41 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -59,8 +59,6 @@
*/
#include <linux/export.h>
#include <linux/moduleparam.h>
-
-#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/list.h>
#include "debug.h"
--
1.7.6
^ permalink raw reply related
* Re: [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Randy Dunlap @ 2011-09-29 20:36 UTC (permalink / raw)
To: Andres Salomon
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers, dsd
In-Reply-To: <20110929133446.40ff3250@queued.net>
On 09/29/11 13:34, Andres Salomon wrote:
> On Thu, 29 Sep 2011 13:17:29 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix build errors when CONFIG_INPUT is disabled (shortened list):
>>
>> olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
>> olpc-xo1-sci.c:(.text+0x1b077): undefined reference to
>> `input_unregister_device' olpc-xo1-sci.c:(.text+0x1b081): undefined
>> reference to `input_free_device'
>> arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined
>> references to `input_event' follow
>> olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to
>> `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x1a4):
>> undefined reference to `input_register_device'
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Cc: Andres Salomon <dilinger@debian.org>
>> ---
>> Found in linux-next but also applies to mainline.
>>
>> arch/x86/Kconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> --- next-2011-0929.orig/arch/x86/Kconfig
>> +++ next-2011-0929/arch/x86/Kconfig
>> @@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
>>
>> config OLPC_XO1_SCI
>> bool "OLPC XO-1 SCI extras"
>> - depends on OLPC && OLPC_XO1_PM
>> + depends on OLPC && OLPC_XO1_PM && INPUT
>> select POWER_SUPPLY
>> select GPIO_CS5535
>> select MFD_CORE
>
> Thanks!
>
> Hm. This might actually need a 'select INPUT' though, since
> OLPC_XO1_SCI is bool while INPUT is tristate. Sigh, bool..
I try to avoid using "select", but you can resubmit the patch
to do that if you must.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
From: Randy Dunlap @ 2011-09-29 20:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, x86 maintainers, Alan Cox
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build when CONFIG_X86_INTEL_MID is enabled but
CONFIG_X86_MRST is not enabled. Fixes this build error:
rtc.c:(.init.text+0x2fbb): undefined reference to `__mrst_cpu_chip'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
arch/x86/include/asm/mrst.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- next-2011-0929.orig/arch/x86/include/asm/mrst.h
+++ next-2011-0929/arch/x86/include/asm/mrst.h
@@ -32,18 +32,18 @@ enum mrst_cpu_type {
extern enum mrst_cpu_type __mrst_cpu_chip;
-#ifdef CONFIG_X86_INTEL_MID
+#ifdef CONFIG_X86_MRST
static inline enum mrst_cpu_type mrst_identify_cpu(void)
{
return __mrst_cpu_chip;
}
-#else /* !CONFIG_X86_INTEL_MID */
+#else /* !CONFIG_X86_MRST */
#define mrst_identify_cpu() (0)
-#endif /* !CONFIG_X86_INTEL_MID */
+#endif /* !CONFIG_X86_MRST */
enum mrst_timer_options {
MRST_TIMER_DEFAULT,
^ permalink raw reply
* Re: [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Andres Salomon @ 2011-09-29 20:34 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton,
x86 maintainers, dsd
In-Reply-To: <4E84D259.5020008@xenotime.net>
On Thu, 29 Sep 2011 13:17:29 -0700
Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build errors when CONFIG_INPUT is disabled (shortened list):
>
> olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
> olpc-xo1-sci.c:(.text+0x1b077): undefined reference to
> `input_unregister_device' olpc-xo1-sci.c:(.text+0x1b081): undefined
> reference to `input_free_device'
> arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined
> references to `input_event' follow
> olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to
> `input_allocate_device' olpc-xo1-sci.c:(.devinit.text+0x1a4):
> undefined reference to `input_register_device'
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: Andres Salomon <dilinger@debian.org>
> ---
> Found in linux-next but also applies to mainline.
>
> arch/x86/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- next-2011-0929.orig/arch/x86/Kconfig
> +++ next-2011-0929/arch/x86/Kconfig
> @@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
>
> config OLPC_XO1_SCI
> bool "OLPC XO-1 SCI extras"
> - depends on OLPC && OLPC_XO1_PM
> + depends on OLPC && OLPC_XO1_PM && INPUT
> select POWER_SUPPLY
> select GPIO_CS5535
> select MFD_CORE
Thanks!
Hm. This might actually need a 'select INPUT' though, since
OLPC_XO1_SCI is bool while INPUT is tristate. Sigh, bool..
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-09-29 20:25 UTC (permalink / raw)
To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CACVXFVOA486EvvymPchHB9V1WBLhsdFQRtr_zuOOo4HTbE0OKA@mail.gmail.com>
On Thursday, September 29, 2011, Ming Lei wrote:
> On Thu, Sep 29, 2011 at 5:26 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> >> But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/
> >> KGDB_KDB in kernel/trace/Makefile.
> >
> > You're right about this.
> >
> >> Also this one is a simple fix and don't introduce any new config option,
> >> which is unnecessary.
> >
> > OK, I'll use your last patch. Care to resend it with a sign-off?
>
> OK, thanks, see attachment.
Applied.
Thanks,
Rafael
^ permalink raw reply
* [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT
From: Randy Dunlap @ 2011-09-29 20:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, Andres Salomon, x86 maintainers
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build errors when CONFIG_INPUT is disabled (shortened list):
olpc-xo1-sci.c:(.text+0x1aee6): undefined reference to `input_event'
olpc-xo1-sci.c:(.text+0x1b077): undefined reference to `input_unregister_device'
olpc-xo1-sci.c:(.text+0x1b081): undefined reference to `input_free_device'
arch/x86/built-in.o:olpc-xo1-sci.c:(.text+0x1b270): more undefined references to `input_event' follow
olpc-xo1-sci.c:(.devinit.text+0x155): undefined reference to `input_allocate_device'
olpc-xo1-sci.c:(.devinit.text+0x1a4): undefined reference to `input_register_device'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andres Salomon <dilinger@debian.org>
---
Found in linux-next but also applies to mainline.
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-0929.orig/arch/x86/Kconfig
+++ next-2011-0929/arch/x86/Kconfig
@@ -2052,7 +2052,7 @@ config OLPC_XO1_RTC
config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras"
- depends on OLPC && OLPC_XO1_PM
+ depends on OLPC && OLPC_XO1_PM && INPUT
select POWER_SUPPLY
select GPIO_CS5535
select MFD_CORE
^ permalink raw reply
* Re: linux-next: Tree for Sept 29 (kvm)
From: Randy Dunlap @ 2011-09-29 19:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, kvm@vger.kernel.org
In-Reply-To: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au>
On 09/28/11 23:57, Stephen Rothwell wrote:
> Hi all,
>
> The linux-next tree is now available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable.
kvm build on i386 says:
ERROR: "__udivdi3" [arch/x86/kvm/kvm.ko] undefined!
which is used in somewhere in start_apic_timer() (probably the divide :).
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox