X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fpatches%2Fsuse-2.6.27.25%2Fpatches.xen%2F747-x86-undo-mfn-limit.patch;fp=src%2Fpatches%2F60021_747-x86-undo-mfn-limit.patch1;h=363d98cf41ed20c05b449d42b8851039b63cdc9d;hb=00e5a55c3c58b7320050d37ca15d98fd48acbf2f;hp=5d428a393495cb265aa7e375a0f58785cd8e2dde;hpb=4935eb8b91cbff9f3a05de77a40b16e980815e77;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/patches/60021_747-x86-undo-mfn-limit.patch1 b/src/patches/suse-2.6.27.25/patches.xen/747-x86-undo-mfn-limit.patch
similarity index 74%
rename from src/patches/60021_747-x86-undo-mfn-limit.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/747-x86-undo-mfn-limit.patch
index 5d428a3934..363d98cf41 100644
--- a/src/patches/60021_747-x86-undo-mfn-limit.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/747-x86-undo-mfn-limit.patch
@@ -9,10 +9,8 @@ Patch-mainline: obsolete
 
 Signed-off-by: Jan Beulich <jbeulich@novell.com>
 
-Index: head-2008-12-01/arch/x86/mm/hypervisor.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/hypervisor.c	2008-10-29 09:55:56.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/hypervisor.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/arch/x86/mm/hypervisor.c	2009-01-16 10:17:45.000000000 +0100
++++ head-2009-01-16/arch/x86/mm/hypervisor.c	2008-12-01 11:25:57.000000000 +0100
 @@ -374,6 +374,15 @@ void xen_destroy_contiguous_region(unsig
  }
  EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);
@@ -83,10 +81,8 @@ Index: head-2008-12-01/arch/x86/mm/hypervisor.c
  }
  EXPORT_SYMBOL_GPL(xen_limit_pages_to_max_mfn);
  
-Index: head-2008-12-01/arch/x86/mm/pgtable_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pgtable_32-xen.c	2007-10-09 11:48:25.000000000 +0200
-+++ head-2008-12-01/arch/x86/mm/pgtable_32-xen.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/arch/x86/mm/pgtable_32-xen.c	2009-01-16 10:17:45.000000000 +0100
++++ head-2009-01-16/arch/x86/mm/pgtable_32-xen.c	2008-12-01 11:25:57.000000000 +0100
 @@ -152,6 +152,12 @@ pte_t *pte_alloc_one_kernel(struct mm_st
  	return pte;
  }
@@ -109,10 +105,8 @@ Index: head-2008-12-01/arch/x86/mm/pgtable_32-xen.c
  		init_page_count(pte);
  	}
  	return pte;
-Index: head-2008-12-01/arch/x86/mm/pageattr_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/pageattr_64-xen.c	2008-07-21 11:00:32.000000000 +0200
-+++ head-2008-12-01/arch/x86/mm/pageattr_64-xen.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/arch/x86/mm/pageattr_64-xen.c	2009-01-16 10:17:45.000000000 +0100
++++ head-2009-01-16/arch/x86/mm/pageattr_64-xen.c	2008-12-01 11:25:57.000000000 +0100
 @@ -248,13 +248,19 @@ void _arch_exit_mmap(struct mm_struct *m
  		mm_unpin(mm);
  }
@@ -134,10 +128,8 @@ Index: head-2008-12-01/arch/x86/mm/pageattr_64-xen.c
  		init_page_count(pte);
  	}
  	return pte;
-Index: head-2008-12-01/drivers/xen/core/gnttab.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/gnttab.c	2008-12-01 11:23:17.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/gnttab.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/drivers/xen/core/gnttab.c	2009-01-16 10:17:45.000000000 +0100
++++ head-2009-01-16/drivers/xen/core/gnttab.c	2008-12-01 11:25:57.000000000 +0100
 @@ -505,8 +505,9 @@ static int gnttab_map(unsigned int start
  	return 0;
  }
@@ -149,10 +141,8 @@ Index: head-2008-12-01/drivers/xen/core/gnttab.c
  	ClearPageForeign(page);
  	gnttab_reset_grant_page(page);
  	put_page(page);
-Index: head-2008-12-01/drivers/xen/netback/netback.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/netback/netback.c	2008-12-01 11:23:17.000000000 +0100
-+++ head-2008-12-01/drivers/xen/netback/netback.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/drivers/xen/netback/netback.c	2009-01-16 10:17:45.000000000 +0100
++++ head-2009-01-16/drivers/xen/netback/netback.c	2008-12-01 11:25:57.000000000 +0100
 @@ -55,7 +55,6 @@ struct netbk_tx_pending_inuse {
  };
  
@@ -172,11 +162,9 @@ Index: head-2008-12-01/drivers/xen/netback/netback.c
  	netif_idx_release(netif_page_index(page));
  }
  
-Index: head-2008-12-01/include/linux/page-flags.h
-===================================================================
---- head-2008-12-01.orig/include/linux/page-flags.h	2008-12-01 11:23:17.000000000 +0100
-+++ head-2008-12-01/include/linux/page-flags.h	2008-12-01 11:25:57.000000000 +0100
-@@ -275,15 +275,15 @@ CLEARPAGEFLAG(Uptodate, uptodate)
+--- head-2009-01-16.orig/include/linux/page-flags.h	2009-01-16 10:01:00.000000000 +0100
++++ head-2009-01-16/include/linux/page-flags.h	2009-01-16 10:20:18.000000000 +0100
+@@ -277,15 +277,15 @@ CLEARPAGEFLAG(Uptodate, uptodate)
  #define PageForeign(page)	test_bit(PG_foreign, &(page)->flags)
  #define SetPageForeign(_page, dtor) do {		\
  	set_bit(PG_foreign, &(_page)->flags);		\
@@ -195,10 +183,8 @@ Index: head-2008-12-01/include/linux/page-flags.h
  
  extern void cancel_dirty_page(struct page *page, unsigned int account_size);
  
-Index: head-2008-12-01/mm/page_alloc.c
-===================================================================
---- head-2008-12-01.orig/mm/page_alloc.c	2008-12-01 11:23:17.000000000 +0100
-+++ head-2008-12-01/mm/page_alloc.c	2008-12-01 11:25:57.000000000 +0100
+--- head-2009-01-16.orig/mm/page_alloc.c	2008-12-08 13:17:58.000000000 +0100
++++ head-2009-01-16/mm/page_alloc.c	2008-12-01 11:25:57.000000000 +0100
 @@ -535,7 +535,7 @@ static void __free_pages_ok(struct page 
  
  #ifdef CONFIG_XEN