From 1261a8a4002a4caa16257514b7607bb43b9ca3c7 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 3 Jul 2008 12:29:34 -0700 Subject: [PATCH] --- yaml --- r: 100033 b: refs/heads/master c: 49c980df552499e5e8595b52448f612fdab0484a h: refs/heads/master i: 100031: 256a2f1b99b1e5ac6addb6afee750544d14715db v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bfe95ffef14c..b6c495106ff8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b50efd2a55fc1344654875369d458bb6838bd37a +refs/heads/master: 49c980df552499e5e8595b52448f612fdab0484a diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index 7227a0a3f3a0..f7d80313ede5 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -1104,9 +1104,6 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) PAGE_KERNEL_LARGE); set_pmd(pmd, __pmd(pte_val(entry))); - addr_end = addr + PMD_SIZE; - p_end = p + PMD_SIZE; - /* check to see if we have contiguous blocks */ if (p_end != p || node_start != node) { if (p_start) @@ -1116,6 +1113,9 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) node_start = node; p_start = p; } + + addr_end = addr + PMD_SIZE; + p_end = p + PMD_SIZE; } else vmemmap_verify((pte_t *)pmd, node, addr, next); }