* Re: linux-next: build failure after merge of the moduleh tree
[not found] <20110928183552.cb27a2b28b02fec275bca009@canb.auug.org.au>
@ 2011-09-28 16:42 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2011-09-28 16:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next, linux-kernel,
Vasanthakumar Thiagarajan, Raja Mani, Vivek Natarajan,
Suraj Sumangala, Joe Perches, Jouni Malinen, John W. Linville,
David Miller, netdev, linux-wireless
On 09/28/2011 11:35 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
>
> Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the
> net tree interacting with the module.h split up.
>
> I have applied the following patch for today (which sould be applied to
> the net or wireless trees).
>
> From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 18:32:34 +1000
> Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion
> of moduleparam.h
>
> Otheriwse the module.h split up fails like this:
>
> drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
Thanks, I applied this to ath6kl.git (had to fix just one conflict).
Later this week I will send a pull request to John so that the patch
should get to the wireless tree soon.
Unless John wants to take the patch directly, of course.
Kalle
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the moduleh tree
[not found] <20111004180333.44f741dc08063a918c9b581f@canb.auug.org.au>
@ 2011-10-04 7:35 ` Kalle Valo
2011-10-04 8:14 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Kalle Valo @ 2011-10-04 7:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Gortmaker, linux-next, linux-kernel, John W. Linville,
linux-wireless
On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
>
> Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> from the wireless tree interacting with the module.h split.
>
> I added this patch:
John&Paul, how do we handle this patch?
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2011 18:01:03 +1100
> Subject: [PATCH] ath6kl: THIS_MODULES needs export.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/wireless/ath/ath6kl/debug.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
> index ba3f23d..7879b53 100644
> --- a/drivers/net/wireless/ath/ath6kl/debug.c
> +++ b/drivers/net/wireless/ath/ath6kl/debug.c
> @@ -19,6 +19,7 @@
> #include <linux/circ_buf.h>
> #include <linux/fs.h>
> #include <linux/vmalloc.h>
> +#include <linux/export.h>
>
> #include "debug.h"
> #include "target.h"
Kalle
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the moduleh tree
2011-10-04 7:35 ` linux-next: build failure after merge of the moduleh tree Kalle Valo
@ 2011-10-04 8:14 ` Stephen Rothwell
2011-10-04 15:09 ` Larry Finger
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-10-04 8:14 UTC (permalink / raw)
To: Kalle Valo
Cc: Paul Gortmaker, linux-next, linux-kernel, John W. Linville,
linux-wireless
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
Hi Kalle,
On Tue, 4 Oct 2011 10:35:29 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>
> On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> > After merging the moduleh tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
> >
> > Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> > from the wireless tree interacting with the module.h split.
> >
> > I added this patch:
>
> John&Paul, how do we handle this patch?
Since it adds an include of export.h (which only exists in Paul's tree),
it goes into Paul's post merge patch series.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the moduleh tree
2011-10-04 8:14 ` Stephen Rothwell
@ 2011-10-04 15:09 ` Larry Finger
0 siblings, 0 replies; 6+ messages in thread
From: Larry Finger @ 2011-10-04 15:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kalle Valo, Paul Gortmaker, linux-next, linux-kernel,
John W. Linville, linux-wireless
On 10/04/2011 03:14 AM, Stephen Rothwell wrote:
>
> Since it adds an include of export.h (which only exists in Paul's tree),
> it goes into Paul's post merge patch series.
Sounds good. ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the moduleh tree
[not found] <20111012172954.4d5a638ef2a399b72bce5bf1@canb.auug.org.au>
@ 2011-10-12 19:25 ` Arend van Spriel
2011-10-12 19:26 ` John W. Linville
0 siblings, 1 reply; 6+ messages in thread
From: Arend van Spriel @ 2011-10-12 19:25 UTC (permalink / raw)
To: John W. Linville; +Cc: Stephen Rothwell, linux-wireless@vger.kernel.org
On 10/12/2011 08:29 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/wireless/brcm80211/brcmutil/utils.c:20:15: error: expected declaration specifiers or '...' before string constant
> drivers/net/wireless/brcm80211/brcmutil/utils.c:21:20: error: expected declaration specifiers or '...' before string constant
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: parameter names (without types) in function declaration [enabled by default]
>
> Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers")
> from the wireless tree interacting with the module.h split up.
>
> These files clearly should include module.h (John, please apply this to the
> wireless tree):
>
> From d89b14ffc84a2b8a54ffe89453b8bbf9cabf1468 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 12 Oct 2011 17:07:06 +1100
> Subject: [PATCH] net: wireless: brcm80211: include module.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Hi John,
Do you intend to take this patch as well. I used it to prepare the patch
series I sent earlier titled "[PATCH 00/22] brcm80211: mainline patch
related cleanup" identified by:
Message-ID: <1318445492-24207-1-git-send-email-arend@broadcom.com>
Gr. AvS
ps: If you want the bare patch file, I still have it on disk here.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the moduleh tree
2011-10-12 19:25 ` Arend van Spriel
@ 2011-10-12 19:26 ` John W. Linville
0 siblings, 0 replies; 6+ messages in thread
From: John W. Linville @ 2011-10-12 19:26 UTC (permalink / raw)
To: Arend van Spriel; +Cc: Stephen Rothwell, linux-wireless@vger.kernel.org
On Wed, Oct 12, 2011 at 09:25:57PM +0200, Arend van Spriel wrote:
> On 10/12/2011 08:29 AM, Stephen Rothwell wrote:
> > Hi Paul,
> >
> > After merging the moduleh tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/net/wireless/brcm80211/brcmutil/utils.c:20:15: error: expected declaration specifiers or '...' before string constant
> > drivers/net/wireless/brcm80211/brcmutil/utils.c:21:20: error: expected declaration specifiers or '...' before string constant
> > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
> > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: parameter names (without types) in function declaration [enabled by default]
> >
> > Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers")
> > from the wireless tree interacting with the module.h split up.
> >
> > These files clearly should include module.h (John, please apply this to the
> > wireless tree):
> >
> > From d89b14ffc84a2b8a54ffe89453b8bbf9cabf1468 Mon Sep 17 00:00:00 2001
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 12 Oct 2011 17:07:06 +1100
> > Subject: [PATCH] net: wireless: brcm80211: include module.h
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Hi John,
>
> Do you intend to take this patch as well. I used it to prepare the patch
> series I sent earlier titled "[PATCH 00/22] brcm80211: mainline patch
> related cleanup" identified by:
>
> Message-ID: <1318445492-24207-1-git-send-email-arend@broadcom.com>
>
> Gr. AvS
>
> ps: If you want the bare patch file, I still have it on disk here.
Please send it to me -- I missed the original.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-12 19:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20111004180333.44f741dc08063a918c9b581f@canb.auug.org.au>
2011-10-04 7:35 ` linux-next: build failure after merge of the moduleh tree Kalle Valo
2011-10-04 8:14 ` Stephen Rothwell
2011-10-04 15:09 ` Larry Finger
[not found] <20111012172954.4d5a638ef2a399b72bce5bf1@canb.auug.org.au>
2011-10-12 19:25 ` Arend van Spriel
2011-10-12 19:26 ` John W. Linville
[not found] <20110928183552.cb27a2b28b02fec275bca009@canb.auug.org.au>
2011-09-28 16:42 ` Kalle Valo
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).