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

[Ian Campbell]

Author: ijc-guest
Date: Fri Aug 20 06:29:20 2010
New Revision: 16167

Log:
Refresh Xen patch to e73f4955a821f850f5b88c32d12a81714523a95f.

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	Thu Aug 19 01:18:45 2010	(r16166)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Fri Aug 20 06:29:20 2010	(r16167)
@@ -1,9 +1,18 @@
-Patch based on commit 69a73fa4836d0d701dbff7d0de3294b96583a4cf of
+Patch based on commit e73f4955a821f850f5b88c32d12a81714523a95f of
 git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git.
 
 The following commit were reverted:
 * bcf16b6b4f34fb40a7aaf637947c7d3bce0be671
 
+To regenerate:
+
+$ git checkout -b debian-base v2.6.32.19
+
+$ git checkout -b debian-pvops e73f4955a821f850f5b88c32d12a81714523a95f
+$ git revert -m 1 bcf16b6b4f34fb40a7aaf637947c7d3bce0be671
+
+$ git diff debian-base..debian-pvops
+
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
 index 5f6aa11..3e30e60 100644
 --- a/Documentation/kernel-parameters.txt
@@ -660,22 +669,10 @@
  extern void __init dmi_check_skip_isa_align(void);
  
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index af6fd36..088f079 100644
+index af6fd36..863e1c2 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -76,6 +76,11 @@ extern struct list_head pgd_list;
- 
- #endif	/* CONFIG_PARAVIRT */
- 
-+static inline pteval_t pte_flags(pte_t pte)
-+{
-+	return pte_val(pte) & PTE_FLAGS_MASK;
-+}
-+
- /*
-  * The following only work if pte_present() is true.
-  * Undefined behaviour if not..
-@@ -397,6 +402,9 @@ static inline unsigned long pages_to_mb(unsigned long npg)
+@@ -397,6 +397,9 @@ static inline unsigned long pages_to_mb(unsigned long npg)
  #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)	\
  	remap_pfn_range(vma, vaddr, pfn, size, prot)
  
@@ -685,7 +682,7 @@
  #if PAGETABLE_LEVELS > 2
  static inline int pud_none(pud_t pud)
  {
-@@ -616,6 +624,9 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
+@@ -616,6 +619,9 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
         memcpy(dst, src, count * sizeof(pgd_t));
  }
  
@@ -708,22 +705,6 @@
  #define HAVE_PAGE_AGP 1
  
  /* fs/proc/kcore.c */
-diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index d1f4a76..a81b0ed 100644
---- a/arch/x86/include/asm/pgtable_types.h
-+++ b/arch/x86/include/asm/pgtable_types.h
-@@ -265,11 +265,6 @@ static inline pteval_t native_pte_val(pte_t pte)
- 	return pte.pte;
- }
- 
--static inline pteval_t pte_flags(pte_t pte)
--{
--	return native_pte_val(pte) & PTE_FLAGS_MASK;
--}
--
- #define pgprot_val(x)	((x).pgprot)
- #define __pgprot(x)	((pgprot_t) { (x) } )
- 
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
 index 13b1885..0aac25a 100644
 --- a/arch/x86/include/asm/processor.h