Hi Russell,
After merging the arm tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
In file included from /scratch/sfr/next/arch/arm/include/asm/page.h:163:0,
from /scratch/sfr/next/include/linux/mmzone.h:20,
from /scratch/sfr/next/include/linux/gfp.h:5,
from /scratch/sfr/next/include/linux/kmod.h:22,
from /scratch/sfr/next/include/linux/module.h:13,
from /scratch/sfr/next/init/version.c:10:
/scratch/sfr/next/arch/arm/include/asm/memory.h:297:0: warning: "virt_to_pfn" redefined [enabled by default]
/scratch/sfr/next/arch/arm/include/asm/memory.h:194:0: note: this is the location of the previous definition
Lots of these ...
Introduced by commit e2b5c192c4a6 ("ARM: 8011/1: ARM hibernation /
suspend-to-disk").
--
Cheers,
Stephen Rothwell [email protected]
Hi Stephen,
I'm not sure if this is helpful, but the virt_to_pfn macro added in
arch/arm/include/asm/memory.h:300 (I assume the 297 warning in yours),
in the hibernation patch:
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
Should be removed as there is an improved version of virt_to_pfn for
arm in this commit: e26a9e00afc482b971afcaef1db8c9034d4d6d7c
Thanks,
Sebastian
On Tue, Apr 22, 2014 at 10:32:23AM +1000, Stephen Rothwell wrote:
> Hi Russell,
>
> After merging the arm tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>
> In file included from /scratch/sfr/next/arch/arm/include/asm/page.h:163:0,
> from /scratch/sfr/next/include/linux/mmzone.h:20,
> from /scratch/sfr/next/include/linux/gfp.h:5,
> from /scratch/sfr/next/include/linux/kmod.h:22,
> from /scratch/sfr/next/include/linux/module.h:13,
> from /scratch/sfr/next/init/version.c:10:
> /scratch/sfr/next/arch/arm/include/asm/memory.h:297:0: warning: "virt_to_pfn" redefined [enabled by default]
> /scratch/sfr/next/arch/arm/include/asm/memory.h:194:0: note: this is the location of the previous definition
>
> Lots of these ...
>
> Introduced by commit e2b5c192c4a6 ("ARM: 8011/1: ARM hibernation /
> suspend-to-disk").
Yes, it's a conflict between that patch and one I pushed during the
merge window. I've asked the Sebastian to validate with his version of
virt_to_pfn() removed, and I'm waiting for the results of that...
That's partly happened, but I'm waiting for the final results.
--
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
Hi Stephen, Russell,
Verified, thanks! Please let me know if anything is needed from me for this.
Thanks!
Sebastian