From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH][VT] Cleanup more fixmap assumptions from gnttab
	code.
Date: Fri, 12 Aug 2005 14:36:41 -0700
Message-ID: <20050812213641.GA14702@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Cleanup more fixmap assumptions from gnttab code.

Missed out a hunk in the earlier patch.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c	Fri Aug 12 14:20:57 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c	Fri Aug 12 21:19:24 2005
@@ -348,6 +348,8 @@
     for ( i = 0; i < NR_GRANT_FRAMES; i++ )
         set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT);
 
+    shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
+
     return 0;
 }
 
@@ -368,7 +370,6 @@
 
     BUG_ON(gnttab_resume());
 
-    shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
 
     for ( i = 0; i < NR_GRANT_ENTRIES; i++ )
         gnttab_free_list[i] = i + 1;