aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen/interface/xen.h
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2012-08-22 12:20:14 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-08-23 10:18:17 -0400
commitbd3f79b71de0410352ab506496a467fcb0620912 (patch)
tree329d52717cb1b04702af154db05eb766c04473cc /include/xen/interface/xen.h
parenta8636c0b2e57d4f31f71aa306b1ee701db3f3c85 (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 'include/xen/interface/xen.h')
-rw-r--r--include/xen/interface/xen.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 3871e4753680..42834a36d345 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -188,7 +188,7 @@ struct mmuext_op {
188 unsigned int cmd; 188 unsigned int cmd;
189 union { 189 union {
190 /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR */ 190 /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR */
191 unsigned long mfn; 191 xen_pfn_t mfn;
192 /* INVLPG_LOCAL, INVLPG_ALL, SET_LDT */ 192 /* INVLPG_LOCAL, INVLPG_ALL, SET_LDT */
193 unsigned long linear_addr; 193 unsigned long linear_addr;
194 } arg1; 194 } arg1;
@@ -428,11 +428,11 @@ struct start_info {
428 unsigned long nr_pages; /* Total pages allocated to this domain. */ 428 unsigned long nr_pages; /* Total pages allocated to this domain. */
429 unsigned long shared_info; /* MACHINE address of shared info struct. */ 429 unsigned long shared_info; /* MACHINE address of shared info struct. */
430 uint32_t flags; /* SIF_xxx flags. */ 430 uint32_t flags; /* SIF_xxx flags. */
431 unsigned long store_mfn; /* MACHINE page number of shared page. */ 431 xen_pfn_t store_mfn; /* MACHINE page number of shared page. */
432 uint32_t store_evtchn; /* Event channel for store communication. */ 432 uint32_t store_evtchn; /* Event channel for store communication. */
433 union { 433 union {
434 struct { 434 struct {
435 unsigned long mfn; /* MACHINE page number of console page. */ 435 xen_pfn_t mfn; /* MACHINE page number of console page. */
436 uint32_t evtchn; /* Event channel for console page. */ 436 uint32_t evtchn; /* Event channel for console page. */
437 } domU; 437 } domU;
438 struct { 438 struct {