[kernel] r15449 - dists/sid/linux-2.6/debian/patches/features/all/xen

[Bastian Blank]

Author: waldi
Date: Thu Mar 25 09:55:50 2010
New Revision: 15449

Log:
debian/patches/features/all/xen/pvops.patch: Update to d945b014ac5d.

Modified:
   dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Wed Mar 24 04:46:44 2010	(r15448)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Thu Mar 25 09:55:50 2010	(r15449)
@@ -1,4 +1,4 @@
-Patch based on commit f1125493ed735ca66725904cc3ef06e907bd480f of
+Patch based on commit d945b014ac5df9592c478bf9486d97e8914aab59 of
 git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git.
 
 diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
@@ -3478,7 +3478,7 @@
  
  	xen_raw_console_write("about to get started...\n");
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 350a3de..3e6b558 100644
+index 350a3de..44a4cd1 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -50,7 +50,9 @@
@@ -3811,7 +3811,7 @@
 +		 * We just don't map the IO APIC - all access is via
 +		 * hypercalls.  Keep the address in the pte for reference.
 +		 */
-+		pte = __pte(__pa(dummy_ioapic_mapping) | __PAGE_KERNEL);
++		pte = pfn_pte(PFN_DOWN(__pa(dummy_ioapic_mapping)), PAGE_KERNEL);
 +		break;
 +#endif
 +
@@ -4479,7 +4479,7 @@
 +}
 +EXPORT_SYMBOL(xen_unregister_device_domain_owner);
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
-index ad0047f..b8b0199 100644
+index ad0047f..3c16973 100644
 --- a/arch/x86/xen/setup.c
 +++ b/arch/x86/xen/setup.c
 @@ -10,6 +10,7 @@
@@ -4551,7 +4551,7 @@
 +
 +static unsigned long __init xen_return_unused_memory(const struct e820map *e820)
 +{
-+	unsigned long last_end = 0;
++	phys_addr_t last_end = 0;
 +	unsigned long released = 0;
 +	int i;
 +