---

yaml --- r: 360937 b: refs/heads/master c: 98e7a98 h: refs/heads/master i: 360935: e28c27e v: v3
git-mirror · Mar 7, 2013 · 458069e · 458069e
1 parent 4670055
commit 458069e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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 */