[kernel] r16404 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Ian Campbell]

Author: ijc-guest
Date: Wed Oct  6 09:32:17 2010
New Revision: 16404

Log:
xen: do not truncate machine address on gnttab_copy_grant_page hypercall (Closes: #599089)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/xen-grant-table-do-not-truncate-machine-address-on-g.patch
   dists/sid/linux-2.6/debian/patches/series/25-extra
      - copied, changed from r16402, dists/sid/linux-2.6/debian/patches/series/24-extra
Deleted:
   dists/sid/linux-2.6/debian/patches/series/24-extra
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Oct  6 02:20:52 2010	(r16403)
+++ dists/sid/linux-2.6/debian/changelog	Wed Oct  6 09:32:17 2010	(r16404)
@@ -10,6 +10,10 @@
   * m68k: modular swim on mac.
   * m68k: never build staging drivers on m68k.
 
+  [ Ian Campbell ]
+  * xen: do not truncate machine address on gnttab_copy_grant_page hypercall
+    (Closes: #599089)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Sep 2010 12:28:58 +0100
 
 linux-2.6 (2.6.32-24) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/xen-grant-table-do-not-truncate-machine-address-on-g.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/xen-grant-table-do-not-truncate-machine-address-on-g.patch	Wed Oct  6 09:32:17 2010	(r16404)
@@ -0,0 +1,27 @@
+From 7ed8586dd2ba2340a28a5d3d21f3f531a5bd30f8 Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ian.campbell at citrix.com>
+Date: Tue, 5 Oct 2010 10:00:42 -0700
+Subject: [PATCH] xen: grant table: do not truncate machine address on gnttab_copy_grant_page
+
+Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
+Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+---
+ drivers/xen/grant-table.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
+index 236bf97..a23c569 100644
+--- a/drivers/xen/grant-table.c
++++ b/drivers/xen/grant-table.c
+@@ -548,7 +548,7 @@ int gnttab_copy_grant_page(grant_ref_t ref, struct page **pagep)
+ 	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+ 		set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY);
+ 
+-		mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
++		mmu.ptr = PFN_PHYS(new_mfn) | MMU_MACHPHYS_UPDATE;
+ 		mmu.val = pfn;
+ 		err = HYPERVISOR_mmu_update(&mmu, 1, NULL, DOMID_SELF);
+ 		BUG_ON(err);
+-- 
+1.7.1
+

Copied and modified: dists/sid/linux-2.6/debian/patches/series/25-extra (from r16402, dists/sid/linux-2.6/debian/patches/series/24-extra)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24-extra	Wed Oct  6 00:38:43 2010	(r16402, copy source)
+++ dists/sid/linux-2.6/debian/patches/series/25-extra	Wed Oct  6 09:32:17 2010	(r16404)
@@ -9,3 +9,4 @@
 
 + features/all/xen/pvops.patch featureset=xen
 + features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch featureset=xen
++ features/all/xen/xen-grant-table-do-not-truncate-machine-address-on-g.patch featureset=xen