Hi all, On Tue, 5 Feb 2013 11:31:22 -0800 Tony Luck <tony.luck@xxxxxxxxx> wrote: > > Today i noticed in linux-next this commit: > > commit b0d9c17503444c2df8cb8e93ccfa4877edd71933 > Author: Sanjay Lal <sanjayl@xxxxxxxxxxx> > Date: Wed Nov 21 18:34:14 2012 -0800 > > MIPS: Export symbols used by KVM/MIPS module > > which causes this kernel build warning on ia64: > > WARNING: vmlinux: 'min_low_pfn' exported twice. Previous export was in vmlinux > > > We just need to delete the arch/ia64 specific export (and grep says > for arch/metag too): > > $ git grep min_low_pfn | grep EXPORT > arch/ia64/kernel/ia64_ksyms.c:EXPORT_SYMBOL(min_low_pfn); /* defined > by bootmem.c, but not exported by generic code */ > arch/metag/kernel/metag_ksyms.c:EXPORT_SYMBOL(min_low_pfn); > mm/bootmem.c:EXPORT_SYMBOL(min_low_pfn); > > > Can you do this in the same branch as the mips change so the bits > will flow to Linus together in the next window? > > ia64 change (which gmail will no doubt mangle) It did :-) > From: "Luck, Tony" <tony.luck@xxxxxxxxx> > > min_low_pfn is now exported by generic code > > Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx> > > --- > > diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c > index 5b7791d..ca95c8b 100644 > --- a/arch/ia64/kernel/ia64_ksyms.c > +++ b/arch/ia64/kernel/ia64_ksyms.c > @@ -25,7 +25,6 @@ EXPORT_SYMBOL(copy_page); > > #ifdef CONFIG_VIRTUAL_MEM_MAP > #include <linux/bootmem.h> > -EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not > exported by generic code */ > EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not > exported by generic code */ > #endif I applied this as a merge fix to the mips tree merge for today, but it should be added to the mips tree. I also applied this as a merge fix (which only I can apply as the metag tree is not in Linus' tree yet): From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Wed, 6 Feb 2013 11:31:24 +1100 Subject: [PATCH] metag: min_low_pfn is now exported by generic code Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/metag/kernel/metag_ksyms.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c index 3cc4d1d..5381514 100644 --- a/arch/metag/kernel/metag_ksyms.c +++ b/arch/metag/kernel/metag_ksyms.c @@ -43,7 +43,6 @@ EXPORT_SYMBOL(pfn_base); #ifdef CONFIG_FLATMEM /* needed for the pfn_valid macro */ EXPORT_SYMBOL(max_pfn); -EXPORT_SYMBOL(min_low_pfn); #endif /* TBI symbols */ -- 1.8.1 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpn6j6pdZXAK.pgp
Description: PGP signature
