ia64/xen-unstable

changeset 19271:3673926b2375

[IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 05 09:32:37 2009 +0000 (2009-03-05)
parents 4b7d638a8b89
children 5dee49f3a86e
files xen/common/xencomm.c xen/include/asm-ia64/mm.h
line diff
     1.1 --- a/xen/common/xencomm.c	Wed Mar 04 14:28:50 2009 +0000
     1.2 +++ b/xen/common/xencomm.c	Thu Mar 05 09:32:37 2009 +0000
     1.3 @@ -51,7 +51,7 @@ xencomm_get_page(unsigned long paddr, st
     1.4          return -EFAULT;
     1.5          
     1.6      *page = maddr_to_page(maddr);
     1.7 -    if ( !get_page(*page, current->domain) == 0 )
     1.8 +    if ( !get_page(*page, current->domain) )
     1.9      {
    1.10          /*
    1.11           * This page might be a page granted by another domain, or this page 
     2.1 --- a/xen/include/asm-ia64/mm.h	Wed Mar 04 14:28:50 2009 +0000
     2.2 +++ b/xen/include/asm-ia64/mm.h	Thu Mar 05 09:32:37 2009 +0000
     2.3 @@ -200,7 +200,8 @@ static inline void put_page(struct page_
     2.4          free_domheap_page(page);
     2.5  }
     2.6  
     2.7 -static inline page_get_owner_and_reference(struct page_info *page)
     2.8 +static inline struct domain *page_get_owner_and_reference(
     2.9 +    struct page_info *page)
    2.10  {
    2.11      unsigned long x, y = page->count_info;
    2.12  
    2.13 @@ -226,7 +227,7 @@ static inline int get_page(struct page_i
    2.14          return 1;
    2.15  
    2.16      put_page(page);
    2.17 -fail:
    2.18 +
    2.19      /* if (!domain->is_dying) */ /* XXX: header inclusion hell */
    2.20      gdprintk(XENLOG_INFO,
    2.21               "Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%" PRtype_info "\n",