diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-08-22 12:20:14 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-08-23 10:18:17 -0400 |
commit | bd3f79b71de0410352ab506496a467fcb0620912 (patch) | |
tree | 329d52717cb1b04702af154db05eb766c04473cc /arch/ia64/include | |
parent | a8636c0b2e57d4f31f71aa306b1ee701db3f3c85 (diff) |
xen: Introduce xen_pfn_t for pfn and mfn types
All the original Xen headers have xen_pfn_t as mfn and pfn type, however
when they have been imported in Linux, xen_pfn_t has been replaced with
unsigned long. That might work for x86 and ia64 but it does not for arm.
Bring back xen_pfn_t and let each architecture define xen_pfn_t as they
see fit.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/ia64/include')
-rw-r--r-- | arch/ia64/include/asm/xen/interface.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h index ee9cad6e749b..3d52a5bbd857 100644 --- a/arch/ia64/include/asm/xen/interface.h +++ b/arch/ia64/include/asm/xen/interface.h | |||
@@ -67,6 +67,10 @@ | |||
67 | #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) | 67 | #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) |
68 | 68 | ||
69 | #ifndef __ASSEMBLY__ | 69 | #ifndef __ASSEMBLY__ |
70 | /* Explicitly size integers that represent pfns in the public interface | ||
71 | * with Xen so that we could have one ABI that works for 32 and 64 bit | ||
72 | * guests. */ | ||
73 | typedef unsigned long xen_pfn_t; | ||
70 | /* Guest handles for primitive C types. */ | 74 | /* Guest handles for primitive C types. */ |
71 | __DEFINE_GUEST_HANDLE(uchar, unsigned char); | 75 | __DEFINE_GUEST_HANDLE(uchar, unsigned char); |
72 | __DEFINE_GUEST_HANDLE(uint, unsigned int); | 76 | __DEFINE_GUEST_HANDLE(uint, unsigned int); |
@@ -79,7 +83,6 @@ DEFINE_GUEST_HANDLE(void); | |||
79 | DEFINE_GUEST_HANDLE(uint64_t); | 83 | DEFINE_GUEST_HANDLE(uint64_t); |
80 | DEFINE_GUEST_HANDLE(uint32_t); | 84 | DEFINE_GUEST_HANDLE(uint32_t); |
81 | 85 | ||
82 | typedef unsigned long xen_pfn_t; | ||
83 | DEFINE_GUEST_HANDLE(xen_pfn_t); | 86 | DEFINE_GUEST_HANDLE(xen_pfn_t); |
84 | #define PRI_xen_pfn "lx" | 87 | #define PRI_xen_pfn "lx" |
85 | #endif | 88 | #endif |