x86/mm: Use pr_cont() in dump_pagetable()

The lack of newlines in preceding format strings is a clear indication
that these were meant to be continuations of one another, and indeed
output ends up quite a bit more compact (and readable) that way.

Switch other plain printk()-s in the function instances to pr_info(),
as requested.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/59A7D72B0200007800175E4E@prv-mh.provo.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Jan Beulich and committed by
Ingo Molnar
39e48d9b 6e0b52d4

+15 -11
+15 -11
arch/x86/mm/fault.c
··· 396 pte_t *pte; 397 398 #ifdef CONFIG_X86_PAE 399 - printk("*pdpt = %016Lx ", pgd_val(*pgd)); 400 if (!low_pfn(pgd_val(*pgd) >> PAGE_SHIFT) || !pgd_present(*pgd)) 401 goto out; 402 #endif 403 p4d = p4d_offset(pgd, address); 404 pud = pud_offset(p4d, address); 405 pmd = pmd_offset(pud, address); 406 - printk(KERN_CONT "*pde = %0*Lx ", sizeof(*pmd) * 2, (u64)pmd_val(*pmd)); 407 408 /* 409 * We must not directly access the pte in the highpte ··· 419 goto out; 420 421 pte = pte_offset_kernel(pmd, address); 422 - printk("*pte = %0*Lx ", sizeof(*pte) * 2, (u64)pte_val(*pte)); 423 out: 424 - printk("\n"); 425 } 426 427 #else /* CONFIG_X86_64: */ ··· 569 if (bad_address(pgd)) 570 goto bad; 571 572 - printk("PGD %lx ", pgd_val(*pgd)); 573 574 if (!pgd_present(*pgd)) 575 goto out; ··· 578 if (bad_address(p4d)) 579 goto bad; 580 581 - printk("P4D %lx ", p4d_val(*p4d)); 582 if (!p4d_present(*p4d) || p4d_large(*p4d)) 583 goto out; 584 ··· 586 if (bad_address(pud)) 587 goto bad; 588 589 - printk("PUD %lx ", pud_val(*pud)); 590 if (!pud_present(*pud) || pud_large(*pud)) 591 goto out; 592 ··· 594 if (bad_address(pmd)) 595 goto bad; 596 597 - printk("PMD %lx ", pmd_val(*pmd)); 598 if (!pmd_present(*pmd) || pmd_large(*pmd)) 599 goto out; 600 ··· 602 if (bad_address(pte)) 603 goto bad; 604 605 - printk("PTE %lx", pte_val(*pte)); 606 out: 607 - printk("\n"); 608 return; 609 bad: 610 - printk("BAD\n"); 611 } 612 613 #endif /* CONFIG_X86_64 */
··· 396 pte_t *pte; 397 398 #ifdef CONFIG_X86_PAE 399 + pr_info("*pdpt = %016Lx ", pgd_val(*pgd)); 400 if (!low_pfn(pgd_val(*pgd) >> PAGE_SHIFT) || !pgd_present(*pgd)) 401 goto out; 402 + #define pr_pde pr_cont 403 + #else 404 + #define pr_pde pr_info 405 #endif 406 p4d = p4d_offset(pgd, address); 407 pud = pud_offset(p4d, address); 408 pmd = pmd_offset(pud, address); 409 + pr_pde("*pde = %0*Lx ", sizeof(*pmd) * 2, (u64)pmd_val(*pmd)); 410 + #undef pr_pde 411 412 /* 413 * We must not directly access the pte in the highpte ··· 415 goto out; 416 417 pte = pte_offset_kernel(pmd, address); 418 + pr_cont("*pte = %0*Lx ", sizeof(*pte) * 2, (u64)pte_val(*pte)); 419 out: 420 + pr_cont("\n"); 421 } 422 423 #else /* CONFIG_X86_64: */ ··· 565 if (bad_address(pgd)) 566 goto bad; 567 568 + pr_info("PGD %lx ", pgd_val(*pgd)); 569 570 if (!pgd_present(*pgd)) 571 goto out; ··· 574 if (bad_address(p4d)) 575 goto bad; 576 577 + pr_cont("P4D %lx ", p4d_val(*p4d)); 578 if (!p4d_present(*p4d) || p4d_large(*p4d)) 579 goto out; 580 ··· 582 if (bad_address(pud)) 583 goto bad; 584 585 + pr_cont("PUD %lx ", pud_val(*pud)); 586 if (!pud_present(*pud) || pud_large(*pud)) 587 goto out; 588 ··· 590 if (bad_address(pmd)) 591 goto bad; 592 593 + pr_cont("PMD %lx ", pmd_val(*pmd)); 594 if (!pmd_present(*pmd) || pmd_large(*pmd)) 595 goto out; 596 ··· 598 if (bad_address(pte)) 599 goto bad; 600 601 + pr_cont("PTE %lx", pte_val(*pte)); 602 out: 603 + pr_cont("\n"); 604 return; 605 bad: 606 + pr_info("BAD\n"); 607 } 608 609 #endif /* CONFIG_X86_64 */