ia64/xen-unstable

changeset 16292:e2d76fb12ae2

ia64: Fix the build after guest_physmap_add_page() changes.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author Keir Fraser <keir@xensource.com>
date Wed Oct 31 15:57:03 2007 +0000 (2007-10-31)
parents 2717128cbdd1
children 3191627e5ad6
files xen/arch/ia64/xen/mm.c xen/include/asm-ia64/grant_table.h xen/include/asm-ia64/shadow.h xen/include/xen/paging.h
line diff
     1.1 --- a/xen/arch/ia64/xen/mm.c	Wed Oct 31 10:07:42 2007 +0000
     1.2 +++ b/xen/arch/ia64/xen/mm.c	Wed Oct 31 15:57:03 2007 +0000
     1.3 @@ -2412,7 +2412,7 @@ steal_page(struct domain *d, struct page
     1.4      return 0;
     1.5  }
     1.6  
     1.7 -void
     1.8 +int
     1.9  guest_physmap_add_page(struct domain *d, unsigned long gpfn,
    1.10                         unsigned long mfn)
    1.11  {
    1.12 @@ -2426,6 +2426,7 @@ guest_physmap_add_page(struct domain *d,
    1.13      //BUG_ON(mfn != ((lookup_domain_mpa(d, gpfn << PAGE_SHIFT) & _PFN_MASK) >> PAGE_SHIFT));
    1.14  
    1.15      perfc_incr(guest_physmap_add_page);
    1.16 +    return 0;
    1.17  }
    1.18  
    1.19  void
     2.1 --- a/xen/include/asm-ia64/grant_table.h	Wed Oct 31 10:07:42 2007 +0000
     2.2 +++ b/xen/include/asm-ia64/grant_table.h	Wed Oct 31 15:57:03 2007 +0000
     2.3 @@ -12,7 +12,7 @@ int create_grant_host_mapping(unsigned l
     2.4  int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned long new_gpaddr, unsigned int flags);
     2.5  
     2.6  // for grant transfer
     2.7 -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn);
     2.8 +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn);
     2.9  
    2.10  /* XXX
    2.11   * somewhere appropriate
     3.1 --- a/xen/include/asm-ia64/shadow.h	Wed Oct 31 10:07:42 2007 +0000
     3.2 +++ b/xen/include/asm-ia64/shadow.h	Wed Oct 31 15:57:03 2007 +0000
     3.3 @@ -40,7 +40,7 @@
     3.4   * Utilities to change relationship of gpfn->mfn for designated domain,
     3.5   * which is required by gnttab transfer, balloon, device model and etc.
     3.6   */
     3.7 -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn);
     3.8 +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn);
     3.9  void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn);
    3.10  
    3.11  static inline int
     4.1 --- a/xen/include/xen/paging.h	Wed Oct 31 10:07:42 2007 +0000
     4.2 +++ b/xen/include/xen/paging.h	Wed Oct 31 15:57:03 2007 +0000
     4.3 @@ -18,7 +18,7 @@
     4.4  #else
     4.5  
     4.6  #define paging_mode_translate(d)              (0)
     4.7 -#define guest_physmap_add_page(d, p, m)       ((void)0)
     4.8 +#define guest_physmap_add_page(d, p, m)       (0)
     4.9  #define guest_physmap_remove_page(d, p, m)    ((void)0)
    4.10  
    4.11  #endif