[Xen-changelog] [xen-unstable] [IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236245557 0
# Node ID 3673926b2375a10c55dafb1a6c478e22ee0b08f2
# Parent  4b7d638a8b89b6d49094e77d6295c6d8ffafc192
[IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/common/xencomm.c      |    2 +-
 xen/include/asm-ia64/mm.h |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff -r 4b7d638a8b89 -r 3673926b2375 xen/common/xencomm.c
--- a/xen/common/xencomm.c      Wed Mar 04 14:28:50 2009 +0000
+++ b/xen/common/xencomm.c      Thu Mar 05 09:32:37 2009 +0000
@@ -51,7 +51,7 @@ xencomm_get_page(unsigned long paddr, st
         return -EFAULT;
         
     *page = maddr_to_page(maddr);
-    if ( !get_page(*page, current->domain) == 0 )
+    if ( !get_page(*page, current->domain) )
     {
         /*
          * This page might be a page granted by another domain, or this page 
diff -r 4b7d638a8b89 -r 3673926b2375 xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Wed Mar 04 14:28:50 2009 +0000
+++ b/xen/include/asm-ia64/mm.h Thu Mar 05 09:32:37 2009 +0000
@@ -200,7 +200,8 @@ static inline void put_page(struct page_
         free_domheap_page(page);
 }
 
-static inline page_get_owner_and_reference(struct page_info *page)
+static inline struct domain *page_get_owner_and_reference(
+    struct page_info *page)
 {
     unsigned long x, y = page->count_info;
 
@@ -226,7 +227,7 @@ static inline int get_page(struct page_i
         return 1;
 
     put_page(page);
-fail:
+
     /* if (!domain->is_dying) */ /* XXX: header inclusion hell */
     gdprintk(XENLOG_INFO,
              "Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%" PRtype_info "\n",

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