[Xen-ia64-devel] [PATCH] ia64 fix for cset 8736

[Alex Williamson <alex.williamson@xxxxxx>]

   The patch below gets ia64 working again on xen-unstable after cset
8736.  Dan, you might want to look over the rest of 8736 and make sure I
didn't miss anything else we should clean up in the ia64 tree.  Thanks,

        Alex

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---

--- a/xen/arch/ia64/xen/dom0_ops.c      Thu Feb  2 13:57:18 2006
+++ b/xen/arch/ia64/xen/dom0_ops.c      Thu Feb  2 08:45:12 2006
@@ -30,17 +30,17 @@
     case DOM0_GETPAGEFRAMEINFO:
     {
         struct page_info *page;
-        unsigned long pfn = op->u.getpageframeinfo.pfn;
+        unsigned long mfn = op->u.getpageframeinfo.mfn;
         domid_t dom = op->u.getpageframeinfo.domain;
         struct domain *d;
 
         ret = -EINVAL;
 
-        if ( unlikely(pfn >= max_page) || 
+        if ( unlikely(!mfn_valid(mfn)) || 
              unlikely((d = find_domain_by_id(dom)) == NULL) )
             break;
 
-        page = &frame_table[pfn];
+        page = &frame_table[mfn];
 
         if ( likely(get_page(page, d)) )
         {
@@ -158,7 +158,7 @@
         struct domain *d = find_domain_by_id(op->u.getmemlist.domain);
         unsigned long start_page = op->u.getmemlist.max_pfns >> 32;
         unsigned long nr_pages = op->u.getmemlist.max_pfns & 0xffffffff;
-        unsigned long pfn;
+        unsigned long mfn;
         unsigned long *buffer = op->u.getmemlist.buffer;
         struct page *page;
 
@@ -177,9 +177,9 @@
 
             for ( i = start_page; i < (start_page + nr_pages); i++ )
             {
-               pfn = gmfn_to_mfn_foreign(d, i);
-
-                if ( put_user(pfn, buffer) )
+               mfn = gmfn_to_mfn_foreign(d, i);
+
+                if ( put_user(mfn, buffer) )
                 {
                     ret = -EFAULT;
                     break;



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