Skip to contentSkip to conversation

x86: remove end_user_pfn

PATCH In review Yinghai Lu 2 participants 2 messages Jul 13, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86: remove end_user_pfn

e820 map already get updated, so don't need to keep that anymore

---
 arch/x86/kernel/e820.c |   19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)
arch/x86/kernel/e820.c +2 -17
Index: linux-2.6/arch/x86/kernel/e820.c
===================================================================
@@ -1049,11 +1049,6 @@ u64 __init early_reserve_e820(u64 startt
 #endif
 
 /*
- * Last pfn which the user wants to use.
- */
-unsigned long __initdata end_user_pfn = MAX_ARCH_PFN;
-
-/*
  * Find the highest page frame number we have available
  */
 static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type)
@@ -1085,8 +1080,6 @@ static unsigned long __init e820_end_pfn
 
 	if (last_pfn > max_arch_pfn)
 		last_pfn = max_arch_pfn;
-	if (last_pfn > end_user_pfn)
-		last_pfn = end_user_pfn;
 
 	printk(KERN_INFO "last_pfn = %#lx max_arch_pfn = %#lx\n",
 			 last_pfn, max_arch_pfn);
@@ -1131,12 +1124,6 @@ int __init e820_find_active_region(const
 	if (*ei_endpfn > last_pfn)
 		*ei_endpfn = last_pfn;
 
-	/* Obey end_user_pfn to save on memmap */
-	if (*ei_startpfn >= end_user_pfn)
-		return 0;
-	if (*ei_endpfn > end_user_pfn)
-		*ei_endpfn = end_user_pfn;
-
 	return 1;
 }
 
@@ -1201,7 +1188,6 @@ static int __init parse_memopt(char *p)
 
 	userdef = 1;
 	mem_size = memparse(p, &p);
-	end_user_pfn = mem_size>>PAGE_SHIFT;
 	e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
 
 	return 0;
@@ -1245,10 +1231,9 @@ static int __init parse_memmap_opt(char
 	} else if (*p == '$') {
 		start_at = memparse(p+1, &p);
 		e820_add_region(start_at, mem_size, E820_RESERVED);
-	} else {
-		end_user_pfn = (mem_size >> PAGE_SHIFT);
+	} else
 		e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
-	}
+
 	return *p == '\0' ? 0 : -EINVAL;
 }
 early_param("memmap", parse_memmap_opt);
#1 lore raw
Quoted 1 line · Yinghai Lu

e820 map already get updated, so don't need to keep that anymore

applied the following patches to x86/core:

Yinghai Lu (5):

      x86: max_low_pfn_mapped fix, #1
      x86: max_low_pfn_mapped fix, #2
      x86: max_low_pfn_mapped fix, #3
      x86, e820: remove end_user_pfn
      x86: fix numaq_tsc_disable calling

thanks Yinghai!

Ingo