Re: [Xen-devel] [PATCH] ia64: build fixes (again)

[Keir Fraser <keir@xxxxxxx>]

On 22/11/2011 15:56, "Jan Beulich" <JBeulich@xxxxxxxx> wrote:

> This undoes a single change from c/s 24136:3622d7fae14d
> (common/grant_table.c) and several from c/s 24100:be8daf78856a
> (common/memory.c). It also completes the former with two previously
> missing ia64 specific code adjustments. Authors Cc-ed.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

I'm not going to Ack IA64 patches. Unless there is someone on the IA64 side
to do so (which apparently there isn't) you can just go ahead and check
these fixup patches in, unless you think a specific patch needs someone
else's Ack.

 -- Keir

> --- a/xen/common/grant_table.c
> +++ b/xen/common/grant_table.c
> @@ -173,7 +173,7 @@ static int __get_paged_frame(unsigned lo
>         rc = GNTST_bad_page;
>      }
>  #else
> -    *frame = readonly ? get_gfn_untyped(rd, gfn) : gfn_to_mfn_private(rd,
> gfn);
> +    *frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
>  #endif
>  
>      return rc;
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -165,7 +165,7 @@ int guest_remove_page(struct domain *d,
>      mfn = mfn_x(get_gfn(d, gmfn, &p2mt));
>      if ( unlikely(p2m_is_paging(p2mt)) )
>      {
> -        guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
> +        guest_physmap_remove_page(d, gmfn, mfn, 0);
>          p2m_mem_paging_drop_page(d, gmfn);
>          put_gfn(d, gmfn);
>          return 1;
> @@ -188,7 +188,7 @@ int guest_remove_page(struct domain *d,
>      if(p2m_is_shared(p2mt))
>      {
>          put_page_and_type(page);
> -        guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
> +        guest_physmap_remove_page(d, gmfn, mfn, 0);
>          put_gfn(d, gmfn);
>          return 1;
>      }
> @@ -207,7 +207,7 @@ int guest_remove_page(struct domain *d,
>      if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
>          put_page(page);
>  
> -    guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
> +    guest_physmap_remove_page(d, gmfn, mfn, 0);
>  
>      put_page(page);
>      put_gfn(d, gmfn);
> @@ -427,7 +427,7 @@ static long memory_exchange(XEN_GUEST_HA
>              gfn = mfn_to_gmfn(d, mfn);
>              /* Pages were unshared above */
>              BUG_ON(SHARED_M2P(gfn));
> -            guest_physmap_remove_page(d, gfn, mfn, PAGE_ORDER_4K);
> +            guest_physmap_remove_page(d, gfn, mfn, 0);
>              put_page(page);
>          }
>  
> --- a/xen/common/tmem_xen.c
> +++ b/xen/common/tmem_xen.c
> @@ -95,7 +95,7 @@ static inline void *cli_get_page(tmem_cl
>      return NULL;
>  }
>  
> -static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp,
> +static inline void cli_put_page(tmem_cli_mfn_t cmfn, void *cli_va, pfp_t
> *cli_pfp,
>                                  unsigned long cli_mfn, bool_t mark_dirty)
>  {
>      ASSERT(0);
> --- a/xen/include/asm-ia64/mm.h
> +++ b/xen/include/asm-ia64/mm.h
> @@ -532,6 +532,7 @@ extern u64 translate_domain_pte(u64 ptev
> u64* itir, struct p2m_entry* entry);
>  #define machine_to_phys_mapping mpt_table
>  
> +#define INVALID_GFN              (~0UL)
>  #define INVALID_M2P_ENTRY        (~0UL)
>  #define VALID_M2P(_e)            (!((_e) & (1UL<<63)))
>  #define SHARED_M2P(_e)           0
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel