Skip to content

Commit

Permalink
x86: fix vmemmap printout check
Browse files Browse the repository at this point in the history
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "Nick Piggin" <npiggin@suse.de>
Cc: "Mark McLoughlin" <markmc@redhat.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: "Eduardo Habkost" <ehabkost@redhat.com>
Cc: "Vegard Nossum" <vegard.nossum@gmail.com>
Cc: "Stephen Tweedie" <sct@redhat.com>
Cc: "Jeremy Fitzhardinge" <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 9, 2008
1 parent b50efd2 commit 49c980d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}
Expand Down

0 comments on commit 49c980d

Please sign in to comment.