Messages in this thread | | | Date | Tue, 27 Apr 2010 11:28:42 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build warning after merge of the wireless tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |