From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Steve deRosier <steve@cozybit.com>
Subject: Re: linux-next: build warning after merge of the wireless tree
Date: Tue, 27 Apr 2010 11:40:45 -0400 [thread overview]
Message-ID: <20100427154043.GA25860@tuxdriver.com> (raw)
In-Reply-To: <20100427112842.3eec02a1.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2010-04-27 15:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 1:28 linux-next: build warning after merge of the wireless tree Stephen Rothwell
2010-04-27 15:40 ` John W. Linville [this message]
2010-04-27 17:07 ` Steve deRosier
2010-04-28 6:17 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-11-17 0:35 Stephen Rothwell
2010-12-07 3:11 Stephen Rothwell
2023-09-12 5:13 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100427154043.GA25860@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steve@cozybit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox