Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c980df authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: fix vmemmap printout check 



Signed-off-by: default avatarYinghai 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: default avatarIngo Molnar <mingo@elte.hu>
parent b50efd2a

arch/x86/mm/init_64.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

		}