]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
authorJulien Grall <julien.grall@linaro.org>
Fri, 18 Apr 2014 15:54:34 +0000 (16:54 +0100)
committerDavid Vrabel <david.vrabel@citrix.com>
Thu, 24 Apr 2014 13:04:57 +0000 (14:04 +0100)
commitadc01864eb543097bfa23d3191a0733145662bac
tree8e6de2f9e5398fdd65133a4725f35d77c8b0b1fd
parent5e40704ed2c69425bcb076fb1890417ef137e6c8
arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h

virt_to_pfn has been defined in asm/memory.h by the commit e26a9e0 "ARM: Better
virt_to_page() handling"

This will result of a compilation warning when CONFIG_XEN is enabled.

arch/arm/include/asm/xen/page.h:80:0: warning: "virt_to_pfn" redefined [enabled by default]
 #define virt_to_pfn(v)          (PFN_DOWN(__pa(v)))
 ^
In file included from arch/arm/include/asm/page.h:163:0,
                 from arch/arm/include/asm/xen/page.h:4,
                 from include/xen/page.h:4,
                 from arch/arm/xen/grant-table.c:33:

The definition in memory.h is nearly the same (it directly expand PFN_DOWN),
so we can safely drop virt_to_pfn in xen include.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
arch/arm/include/asm/xen/page.h