Imported linux-2.6.27.39 suse/xen patches.

[people/ummeegge/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.xen / xen-x86-dcr-fallback

diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen-x86-dcr-fallback b/src/patches/suse-2.6.27.39/patches.xen/xen-x86-dcr-fallback
similarity index 83%
rename from src/patches/suse-2.6.27.31/patches.xen/xen-x86-dcr-fallback
rename to src/patches/suse-2.6.27.39/patches.xen/xen-x86-dcr-fallback
index 830acd313fbef50230e8c22e0795bcc3cf15584a..2068d0d7f6ca8c3c45ae32517b576d012dec2dc1 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen-x86-dcr-fallback
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen-x86-dcr-fallback
@@ -6,8 +6,8 @@ References: 181869
 This avoids losing precious special memory in places where any memory can be
 used.
 
---- sle11-2009-06-29.orig/arch/x86/mm/hypervisor.c     2009-03-16 16:17:45.000000000 +0100
-+++ sle11-2009-06-29/arch/x86/mm/hypervisor.c  2009-03-30 12:18:24.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/mm/hypervisor.c     2009-08-31 11:47:04.000000000 +0200
++++ sle11-2009-08-26/arch/x86/mm/hypervisor.c  2009-03-30 12:18:24.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <xen/interface/memory.h>
  #include <linux/module.h>
@@ -100,9 +100,9 @@ used.
  }
  EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);
  
---- sle11-2009-06-29.orig/drivers/xen/balloon/balloon.c        2009-06-29 15:44:49.000000000 +0200
-+++ sle11-2009-06-29/drivers/xen/balloon/balloon.c     2009-06-29 15:46:09.000000000 +0200
-@@ -665,7 +665,7 @@ struct page **alloc_empty_pages_and_page
+--- sle11-2009-08-26.orig/drivers/xen/balloon/balloon.c        2009-08-31 11:47:38.000000000 +0200
++++ sle11-2009-08-26/drivers/xen/balloon/balloon.c     2009-08-31 11:48:33.000000000 +0200
+@@ -696,7 +696,7 @@ struct page **alloc_empty_pages_and_page
        goto out;
  }
  
@@ -111,9 +111,12 @@ used.
  {
        unsigned long flags;
        int i;
-@@ -678,13 +678,26 @@ void free_empty_pages_and_pagevec(struct
+@@ -707,15 +707,28 @@ void free_empty_pages_and_pagevec(struct
+       balloon_lock(flags);
+       for (i = 0; i < nr_pages; i++) {
                BUG_ON(page_count(pagevec[i]) != 1);
-               balloon_append(pagevec[i]);
+-              balloon_append(pagevec[i], 0);
++              balloon_append(pagevec[i], !free_vec);
        }
 +      if (!free_vec)
 +              totalram_pages = bs.current_pages -= nr_pages;
@@ -139,8 +142,8 @@ used.
  void balloon_release_driver_page(struct page *page)
  {
        unsigned long flags;
---- sle11-2009-06-29.orig/include/xen/balloon.h        2009-03-16 16:38:05.000000000 +0100
-+++ sle11-2009-06-29/include/xen/balloon.h     2009-03-16 16:40:33.000000000 +0100
+--- sle11-2009-08-26.orig/include/xen/balloon.h        2009-08-31 11:47:04.000000000 +0200
++++ sle11-2009-08-26/include/xen/balloon.h     2009-03-16 16:40:33.000000000 +0100
 @@ -47,6 +47,10 @@ void balloon_update_driver_allowance(lon
  struct page **alloc_empty_pages_and_pagevec(int nr_pages);
  void free_empty_pages_and_pagevec(struct page **pagevec, int nr_pages);