lkml.org 
[lkml]   [2008]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: cleanup max_pfn_mapped usage - 64bit
Date

64bit only after init_memory_mapping, we get valid max_pfn_mapped.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

Index: linux-2.6/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_64.c
+++ linux-2.6/arch/x86/kernel/e820_64.c
@@ -55,16 +55,12 @@ unsigned long __init e820_end_of_ram(voi

last_pfn = find_max_pfn_with_active_regions();

- if (last_pfn > max_pfn_mapped)
- max_pfn_mapped = last_pfn;
- if (max_pfn_mapped > MAXMEM>>PAGE_SHIFT)
- max_pfn_mapped = MAXMEM>>PAGE_SHIFT;
+ if (last_pfn > MAXMEM>>PAGE_SHIFT)
+ last_pfn = MAXMEM>>PAGE_SHIFT;
if (last_pfn > end_user_pfn)
last_pfn = end_user_pfn;
- if (last_pfn > max_pfn_mapped)
- last_pfn = max_pfn_mapped;

- printk(KERN_INFO "max_pfn_mapped = %lu\n", max_pfn_mapped);
+ printk(KERN_INFO "last_pfn = %lu\n", last_pfn);
return last_pfn;
}

@@ -109,10 +105,6 @@ static int __init e820_find_active_regio
if (*ei_startpfn >= *ei_endpfn)
return 0;

- /* Check if max_pfn_mapped should be updated */
- if (ei->type != E820_RAM && *ei_endpfn > max_pfn_mapped)
- max_pfn_mapped = *ei_endpfn;
-
/* Skip if map is outside the node */
if (ei->type != E820_RAM || *ei_endpfn <= start_pfn ||
*ei_startpfn >= last_pfn)
@@ -229,7 +221,6 @@ static int __init parse_memmap_opt(char
saved_max_pfn = e820_end_of_ram();
remove_all_active_ranges();
#endif
- max_pfn_mapped = 0;
e820.nr_map = 0;
userdef = 1;
return 0;
Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -388,7 +388,7 @@ void __init setup_arch(char **cmdline_p)

check_efer();

- max_pfn_mapped = init_memory_mapping(0, (max_pfn_mapped << PAGE_SHIFT));
+ max_pfn_mapped = init_memory_mapping(0, (end_pfn << PAGE_SHIFT));
if (efi_enabled)
efi_init();


\
 
 \ /
  Last update: 2008-06-02 09:03    [W:0.220 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site