linux-next: build warning after merge of the wireless tree

linux-next: build warning after merge of the wireless tree

[Stephen Rothwell]

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

Hi John,

After merging the wireless tree, today's linux-next build (x86_64 allmodconfig)
produced these warnings:

In file included from drivers/net/wireless/libertas_tf/main.c:12:
drivers/net/wireless/libertas_tf/deb_defs.h:12:1: warning: "pr_fmt" redefined
In file included from arch/x86/include/asm/percpu.h:44,
                 from arch/x86/include/asm/current.h:5,
                 from arch/x86/include/asm/processor.h:15,
                 from arch/x86/include/asm/thread_info.h:22,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:12,
                 from drivers/net/wireless/libertas_tf/main.c:10:
include/linux/kernel.h:376:1: warning: this is the location of the previous definition
In file included from drivers/net/wireless/libertas_tf/cmd.c:12:
drivers/net/wireless/libertas_tf/deb_defs.h:12:1: warning: "pr_fmt" redefined
In file included from arch/x86/include/asm/percpu.h:44,
                 from arch/x86/include/asm/current.h:5,
                 from arch/x86/include/asm/processor.h:15,
                 from arch/x86/include/asm/thread_info.h:22,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:12,
                 from drivers/net/wireless/libertas_tf/cmd.c:10:
include/linux/kernel.h:376:1: warning: this is the location of the previous definition

Presumably this is caused by the merge fixup I did that explicitly
includes linux/slab.h before deb_defs.h.  So you may want to try a
different merge fix.

-- 
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 warning after merge of the wireless tree

[John W. Linville]

On Tue, Apr 27, 2010 at 11:28:42AM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> After merging the wireless tree, today's linux-next build (x86_64 allmodconfig)
> produced these warnings:
> 
> In file included from drivers/net/wireless/libertas_tf/main.c:12:
> drivers/net/wireless/libertas_tf/deb_defs.h:12:1: warning: "pr_fmt" redefined
> In file included from arch/x86/include/asm/percpu.h:44,
>                  from arch/x86/include/asm/current.h:5,
>                  from arch/x86/include/asm/processor.h:15,
>                  from arch/x86/include/asm/thread_info.h:22,
>                  from include/linux/thread_info.h:56,
>                  from include/linux/preempt.h:9,
>                  from include/linux/spinlock.h:50,
>                  from include/linux/mmzone.h:7,
>                  from include/linux/gfp.h:4,
>                  from include/linux/slab.h:12,
>                  from drivers/net/wireless/libertas_tf/main.c:10:
> include/linux/kernel.h:376:1: warning: this is the location of the previous definition
> In file included from drivers/net/wireless/libertas_tf/cmd.c:12:
> drivers/net/wireless/libertas_tf/deb_defs.h:12:1: warning: "pr_fmt" redefined
> In file included from arch/x86/include/asm/percpu.h:44,
>                  from arch/x86/include/asm/current.h:5,
>                  from arch/x86/include/asm/processor.h:15,
>                  from arch/x86/include/asm/thread_info.h:22,
>                  from include/linux/thread_info.h:56,
>                  from include/linux/preempt.h:9,
>                  from include/linux/spinlock.h:50,
>                  from include/linux/mmzone.h:7,
>                  from include/linux/gfp.h:4,
>                  from include/linux/slab.h:12,
>                  from drivers/net/wireless/libertas_tf/cmd.c:10:
> include/linux/kernel.h:376:1: warning: this is the location of the previous definition
> 
> Presumably this is caused by the merge fixup I did that explicitly
> includes linux/slab.h before deb_defs.h.  So you may want to try a
> different merge fix.

Right.  So in wireless-testing I did the includes in the other order
(i.e. "deb_defs.h" first), but that is a bit ugly.  Any suggestions
on alternatives?

"#undef pr_fmt" just before the "#define pr_fmt(fmt)..." line in
db_defs.h seems to eliminate the warning even with the more normal
ordering of the #include lines.  I'm not familiar with the usage of
pr_fmt -- will doing the above preserve the desired effect?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: build warning after merge of the wireless tree

[Steve deRosier]

On Tue, Apr 27, 2010 at 8:40 AM, John W. Linville
<linville@tuxdriver.com> wrote:
>
> Right.  So in wireless-testing I did the includes in the other order
> (i.e. "deb_defs.h" first), but that is a bit ugly.  Any suggestions
> on alternatives?
>
> "#undef pr_fmt" just before the "#define pr_fmt(fmt)..." line in
> db_defs.h seems to eliminate the warning even with the more normal
> ordering of the #include lines.  I'm not familiar with the usage of
> pr_fmt -- will doing the above preserve the desired effect?

John,

I thought about that particular strategy (doing the #undef) instead of
the non-traditional include mess.  But not being familiar enough with
the pr_fmt stuff, I didn't want to do it.

My goal was to get the '#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt'
line in the deb_defs.h header so it was only in one place.  But to
build, that define must be before kernel.h gets included anywhere.
Hence the current mess.

I'm OK with the #undef strategy and moving the deb_defs.h include to a
better position if that's the correct way to do this.  Please let me
know if I have any action items on this.

- Steve

Re: linux-next: build warning after merge of the wireless tree

[Stephen Rothwell]

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

Hi John,

On Tue, 27 Apr 2010 10:07:12 -0700 Steve deRosier <steve@cozybit.com> wrote:
>
> On Tue, Apr 27, 2010 at 8:40 AM, John W. Linville
> <linville@tuxdriver.com> wrote:
> >
> > Right.  So in wireless-testing I did the includes in the other order
> > (i.e. "deb_defs.h" first), but that is a bit ugly.  Any suggestions
> > on alternatives?

I have done that as well for today in linux-next.

> > "#undef pr_fmt" just before the "#define pr_fmt(fmt)..." line in
> > db_defs.h seems to eliminate the warning even with the more normal
> > ordering of the #include lines.  I'm not familiar with the usage of
> > pr_fmt -- will doing the above preserve the desired effect?
>
> I thought about that particular strategy (doing the #undef) instead of
> the non-traditional include mess.  But not being familiar enough with
> the pr_fmt stuff, I didn't want to do it.
> 
> My goal was to get the '#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt'
> line in the deb_defs.h header so it was only in one place.  But to
> build, that define must be before kernel.h gets included anywhere.
> Hence the current mess.
> 
> I'm OK with the #undef strategy and moving the deb_defs.h include to a
> better position if that's the correct way to do this.  Please let me
> know if I have any action items on this.

The only problem I could see with that is is there are some inline
functions in the headers files between where the first and second #define
pr_fmt s get done.

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

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

linux-next: build warning after merge of the wireless tree

[Stephen Rothwell]

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

Hi John,

After merging the wireless tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_legacy_tx_cmd_protection' exported twice. Previous export was in drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_isr_legacy' exported twice. Previous export was in drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_legacy_mac_bss_info_changed' exported twice. Previous export was in drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_legacy_mac_reset_tsf' exported twice. Previous export was in drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_legacy_mac_config' exported twice. Previous export was in drivers/net/wireless/iwlwifi/iwl3945.ko

Probably introduced by commit dd0dd411f7178a20ea93a3cfa39123f078a07e25
("iwlwifi: fix modular legacy build errors").

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

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

linux-next: build warning after merge of the wireless tree

[Stephen Rothwell]

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

Hi John,

After merging the wireless tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

net/mac80211/mlme.c: In function 'ieee80211_sta_work':
net/mac80211/mlme.c:1981: warning: too many arguments for format

Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d
("mac80211: speed up AP probing using nullfunc frames").

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

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

linux-next: build warning after merge of the wireless tree

[Stephen Rothwell]

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

Hi all,

After merging the wireless tree, today's linux-next build (htmldocs)
produced this warning:

include/net/cfg80211.h:6134: warning: Function parameter or member 'cqm_rssi_work' not described in 'wireless_dev'

Introduced by commit

  37c20b2effe9 ("wifi: cfg80211: fix cqm_config access race")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]