lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, 32-bit: refactor find_low_pfn_range()

Browse Source 
Impact: cleanup

Make the max_low_pfn logic a bit more standard between
lowmem_pfn_init() and highmem_pfn_init().

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-02-12 15:16:03 +01:00
parent 4769843bc2
commit d88316c243
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/mm/init_32.c
View File

@@ -687,6 +687,9 @@ early_param("highmem", parse_highmem);
*/ */
void __init lowmem_pfn_init(void) void __init lowmem_pfn_init(void)
{ {
/* max_low_pfn is 0, we already have early_res support */
max_low_pfn = max_pfn;
if (highmem_pages == -1) if (highmem_pages == -1)
highmem_pages = 0; highmem_pages = 0;
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
@@ -720,6 +723,8 @@ void __init lowmem_pfn_init(void)
*/ */
void __init highmem_pfn_init(void) void __init highmem_pfn_init(void)
{ {
max_low_pfn = MAXMEM_PFN;
if (highmem_pages == -1) if (highmem_pages == -1)
highmem_pages = max_pfn - MAXMEM_PFN; highmem_pages = max_pfn - MAXMEM_PFN;
@@ -732,7 +737,6 @@ void __init highmem_pfn_init(void)
pages_to_mb(highmem_pages)); pages_to_mb(highmem_pages));
highmem_pages = 0; highmem_pages = 0;
} }
max_low_pfn = MAXMEM_PFN;
#ifndef CONFIG_HIGHMEM #ifndef CONFIG_HIGHMEM
/* Maximum memory usable is what is directly addressable */ /* Maximum memory usable is what is directly addressable */
printk(KERN_WARNING "Warning only %ldMB will be used.\n", MAXMEM>>20); printk(KERN_WARNING "Warning only %ldMB will be used.\n", MAXMEM>>20);
@@ -758,13 +762,10 @@ void __init find_low_pfn_range(void)
{ {
/* it could update max_pfn */ /* it could update max_pfn */
/* max_low_pfn is 0, we already have early_res support */ if (max_pfn <= MAXMEM_PFN)
max_low_pfn = max_pfn;
if (max_low_pfn > MAXMEM_PFN)
highmem_pfn_init();
else
lowmem_pfn_init(); lowmem_pfn_init();
else
highmem_pfn_init();
} }
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES