From ae0d32c5275c4181b3bff37bbc6ca76e6bb4f7df Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 31 Oct 2007 15:57:03 +0000 Subject: [PATCH] ia64: Fix the build after guest_physmap_add_page() changes. Signed-off-by: Alex Williamson --- xen/arch/ia64/xen/mm.c | 3 ++- xen/include/asm-ia64/grant_table.h | 2 +- xen/include/asm-ia64/shadow.h | 2 +- xen/include/xen/paging.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c index a774f98641..b1a5da828f 100644 --- a/xen/arch/ia64/xen/mm.c +++ b/xen/arch/ia64/xen/mm.c @@ -2412,7 +2412,7 @@ steal_page(struct domain *d, struct page_info *page, unsigned int memflags) return 0; } -void +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn) { @@ -2426,6 +2426,7 @@ guest_physmap_add_page(struct domain *d, unsigned long gpfn, //BUG_ON(mfn != ((lookup_domain_mpa(d, gpfn << PAGE_SHIFT) & _PFN_MASK) >> PAGE_SHIFT)); perfc_incr(guest_physmap_add_page); + return 0; } void diff --git a/xen/include/asm-ia64/grant_table.h b/xen/include/asm-ia64/grant_table.h index 31dfbe4c89..e5763636f1 100644 --- a/xen/include/asm-ia64/grant_table.h +++ b/xen/include/asm-ia64/grant_table.h @@ -12,7 +12,7 @@ int create_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned long new_gpaddr, unsigned int flags); // for grant transfer -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); /* XXX * somewhere appropriate diff --git a/xen/include/asm-ia64/shadow.h b/xen/include/asm-ia64/shadow.h index 12d16c0e4b..d978a2bccf 100644 --- a/xen/include/asm-ia64/shadow.h +++ b/xen/include/asm-ia64/shadow.h @@ -40,7 +40,7 @@ * Utilities to change relationship of gpfn->mfn for designated domain, * which is required by gnttab transfer, balloon, device model and etc. */ -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn); static inline int diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h index 54ab4add84..3e77d94e8e 100644 --- a/xen/include/xen/paging.h +++ b/xen/include/xen/paging.h @@ -18,7 +18,7 @@ #else #define paging_mode_translate(d) (0) -#define guest_physmap_add_page(d, p, m) ((void)0) +#define guest_physmap_add_page(d, p, m) (0) #define guest_physmap_remove_page(d, p, m) ((void)0) #endif -- 2.39.5