lkml.org 
[lkml]   [2010]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build warning after merge of the wireless tree
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.


\
 
 \ /
  Last update: 2010-04-27 17:47    [W:0.073 / U:1.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site