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

[Ben Hutchings]

Author: benh
Date: Tue Mar 16 01:44:04 2010
New Revision: 15390

Log:
Remove addition of userpte parameter, included in 2.6.32.10

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	Tue Mar 16 01:27:48 2010	(r15389)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Tue Mar 16 01:44:04 2010	(r15390)
@@ -1,21 +1,3 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 5bc4eaa..345c399 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -2668,6 +2668,13 @@ and is between 256 and 4096 characters. It is defined in the file
- 					medium is write-protected).
- 			Example: quirks=0419:aaf5:rl,0421:0433:rc
- 
-+	userpte=
-+			[X86] Flags controlling user PTE allocations.
-+
-+				nohigh = do not allocate PTE pages in
-+					HIGHMEM regardless of setting
-+					of CONFIG_HIGHPTE.
-+
- 	vdso=		[X86,SH]
- 			vdso=2: enable compat VDSO (default with COMPAT_VDSO)
- 			vdso=1: enable VDSO (default)
 diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
 index 29a6ff8..81f9b94 100644
 --- a/Documentation/x86/x86_64/boot-options.txt
@@ -437,22 +419,6 @@
  extern void __init dmi_check_pciprobe(void);
  extern void __init dmi_check_skip_isa_align(void);
  
-diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
-index 0e8c2a0..271de94 100644
---- a/arch/x86/include/asm/pgalloc.h
-+++ b/arch/x86/include/asm/pgalloc.h
-@@ -23,6 +23,11 @@ static inline void paravirt_release_pud(unsigned long pfn) {}
- #endif
- 
- /*
-+ * Flags to use when allocating a user page table page.
-+ */
-+extern gfp_t __userpte_alloc_gfp;
-+
-+/*
-  * Allocate and free page tables.
-  */
- extern pgd_t *pgd_alloc(struct mm_struct *);
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
 index af6fd36..863e1c2 100644
 --- a/arch/x86/include/asm/pgtable.h
@@ -2626,7 +2592,7 @@
 index ed34f5e..103e324 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
-@@ -4,8 +4,29 @@
+@@ -4,6 +4,9 @@
  #include <asm/tlb.h>
  #include <asm/fixmap.h>
  
@@ -2635,14 +2601,11 @@
 +
  #define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO
  
-+#ifdef CONFIG_HIGHPTE
-+#define PGALLOC_USER_GFP __GFP_HIGHMEM
-+#else
-+#define PGALLOC_USER_GFP 0
-+#endif
-+
-+gfp_t __userpte_alloc_gfp = PGALLOC_GFP | PGALLOC_USER_GFP;
-+
+ #ifdef CONFIG_HIGHPTE
+@@ -17,6 +20,16 @@
+ 
+ gfp_t __userpte_alloc_gfp = PGALLOC_GFP | PGALLOC_USER_GFP;
+ 
 +pgprot_t arch_vm_get_page_prot(unsigned vm_flags)
 +{
 +	pgprot_t ret = __pgprot(0);
@@ -2656,41 +2619,6 @@
  pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
  {
  	return (pte_t *)__get_free_page(PGALLOC_GFP);
-@@ -15,16 +36,29 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
- {
- 	struct page *pte;
- 
--#ifdef CONFIG_HIGHPTE
--	pte = alloc_pages(PGALLOC_GFP | __GFP_HIGHMEM, 0);
--#else
--	pte = alloc_pages(PGALLOC_GFP, 0);
--#endif
-+	pte = alloc_pages(__userpte_alloc_gfp, 0);
- 	if (pte)
- 		pgtable_page_ctor(pte);
- 	return pte;
- }
- 
-+static int __init setup_userpte(char *arg)
-+{
-+	if (!arg)
-+		return -EINVAL;
-+
-+	/*
-+	 * "userpte=nohigh" disables allocation of user pagetables in
-+	 * high memory.
-+	 */
-+	if (strcmp(arg, "nohigh") == 0)
-+		__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
-+	else
-+		return -EINVAL;
-+	return 0;
-+}
-+early_param("userpte", setup_userpte);
-+
- void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
- {
- 	pgtable_page_dtor(pte);
 @@ -267,6 +301,12 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)