From 458069e2db56d54d481631a074cd2fab43f208c4 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 6 Mar 2013 20:18:21 -0800 Subject: [PATCH] --- yaml --- r: 360937 b: refs/heads/master c: 98e7a989979b185f49e86ddaed2ad6890299d9f0 h: refs/heads/master i: 360935: e28c27e82238b00a2228c93ce156a9ed4758f5ad v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index af2e7e5ec84d..0723fd05636e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 015221fefbc93689dd47508a66326556adf2abcd +refs/heads/master: 98e7a989979b185f49e86ddaed2ad6890299d9f0 diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c index 4903a03ae876..59b7fc453277 100644 --- a/trunk/arch/x86/mm/init.c +++ b/trunk/arch/x86/mm/init.c @@ -410,9 +410,8 @@ void __init init_mem_mapping(void) /* the ISA range is always mapped regardless of memory holes */ init_memory_mapping(0, ISA_END_ADDRESS); - /* xen has big range in reserved near end of ram, skip it at first */ - addr = memblock_find_in_range(ISA_END_ADDRESS, end, PMD_SIZE, - PAGE_SIZE); + /* xen has big range in reserved near end of ram, skip it at first.*/ + addr = memblock_find_in_range(ISA_END_ADDRESS, end, PMD_SIZE, PMD_SIZE); real_end = addr + PMD_SIZE; /* step_size need to be small so pgt_buf from BRK could cover it */