View | Details | Raw Unified | Return to bug 11237 | Differences between
and this patch

Collapse All | Expand All

(-)a/arch/x86/mm/init_64.c (+6 lines)
Lines 331-336 Link Here
331
		}
331
		}
332
332
333
		if (pmd_val(*pmd)) {
333
		if (pmd_val(*pmd)) {
334
			printk("addr %lx reusing pmd %lx %016lx\n",
335
			       address, __pa(pmd), pmd_val(*pmd));
334
			if (!pmd_large(*pmd))
336
			if (!pmd_large(*pmd))
335
				last_map_addr = phys_pte_update(pmd, address,
337
				last_map_addr = phys_pte_update(pmd, address,
336
								 end);
338
								 end);
Lines 392-397 Link Here
392
		}
394
		}
393
395
394
		if (pud_val(*pud)) {
396
		if (pud_val(*pud)) {
397
			printk("addr %lx reusing pud %lx %016lx\n",
398
			       addr, __pa(pud), pud_val(*pud));
395
			if (!pud_large(*pud))
399
			if (!pud_large(*pud))
396
				last_map_addr = phys_pmd_update(pud, addr, end,
400
				last_map_addr = phys_pmd_update(pud, addr, end,
397
							 page_size_mask);
401
							 page_size_mask);
Lines 500-505 Link Here
500
			next = end;
504
			next = end;
501
505
502
		if (pgd_val(*pgd)) {
506
		if (pgd_val(*pgd)) {
507
			printk("addr %lx reusing pgd %lx %016lx\n",
508
			       __pa(start), __pa(pgd), pgd_val(*pgd));
503
			last_map_addr = phys_pud_update(pgd, __pa(start),
509
			last_map_addr = phys_pud_update(pgd, __pa(start),
504
						 __pa(end), page_size_mask);
510
						 __pa(end), page_size_mask);
505
			continue;
511
			continue;

Return to bug 11237