From: Chris Dearman <chris@xxxxxxxx>
Signed-off-by: Chris Dearman <chris@xxxxxxxx>
---
arch/mips/kernel/setup.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 2950b97..1e9862d 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -326,7 +326,6 @@ static void __init bootmem_init(void)
/*
* Determine low and high memory ranges
*/
- max_pfn = max_low_pfn;
if (max_low_pfn > PFN_DOWN(HIGHMEM_START)) {
#ifdef CONFIG_HIGHMEM
highstart_pfn = PFN_DOWN(HIGHMEM_START);
@@ -334,6 +333,8 @@ static void __init bootmem_init(void)
#endif
max_low_pfn = PFN_DOWN(HIGHMEM_START);
}
+ /* Propagate final value of max_low_pfn to max_pfn */
+ max_pfn = max_low_pfn;
/*
* Initialize the boot-time allocator with low memory only.
