aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_32.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:34:10 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:10 -0500
commitd7d119d777d7ed22c4095915e9c985a8b75bfe5f (patch)
tree7612f89b51ad44fe2444f29fd6dafe37137ee847 /arch/x86/mm/init_32.c
parent8550eb99821b3f78cddfd19964f30e8bc4e429e0 (diff)
x86: arch/x86/mm/init_32.c printk fixes
printk fixes. NOP in terms of functionality, but strings got a bit larger due to the KERN_ markers that were added. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r--arch/x86/mm/init_32.c38
1 files changed, 22 insertions, 16 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index c6975fc6944a..02d269c07b96 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -530,7 +530,7 @@ void __init paging_init(void)
530#ifdef CONFIG_X86_PAE 530#ifdef CONFIG_X86_PAE
531 set_nx(); 531 set_nx();
532 if (nx_enabled) 532 if (nx_enabled)
533 printk("NX (Execute Disable) protection: active\n"); 533 printk(KERN_INFO "NX (Execute Disable) protection: active\n");
534#endif 534#endif
535 pagetable_init(); 535 pagetable_init();
536 536
@@ -557,7 +557,8 @@ void __init paging_init(void)
557 */ 557 */
558static void __init test_wp_bit(void) 558static void __init test_wp_bit(void)
559{ 559{
560 printk("Checking if this processor honours the WP bit even in supervisor mode... "); 560 printk(KERN_INFO
561 "Checking if this processor honours the WP bit even in supervisor mode...");
561 562
562 /* Any page-aligned address will do, the test is non-destructive */ 563 /* Any page-aligned address will do, the test is non-destructive */
563 __set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY); 564 __set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY);
@@ -565,12 +566,13 @@ static void __init test_wp_bit(void)
565 clear_fixmap(FIX_WP_TEST); 566 clear_fixmap(FIX_WP_TEST);
566 567
567 if (!boot_cpu_data.wp_works_ok) { 568 if (!boot_cpu_data.wp_works_ok) {
568 printk("No.\n"); 569 printk(KERN_CONT "No.\n");
569#ifdef CONFIG_X86_WP_WORKS_OK 570#ifdef CONFIG_X86_WP_WORKS_OK
570 panic("This kernel doesn't support CPU's with broken WP. Recompile it for a 386!"); 571 panic(
572 "This kernel doesn't support CPU's with broken WP. Recompile it for a 386!");
571#endif 573#endif
572 } else { 574 } else {
573 printk("Ok.\n"); 575 printk(KERN_CONT "Ok.\n");
574 } 576 }
575} 577}
576 578
@@ -588,10 +590,12 @@ void __init mem_init(void)
588 590
589#ifdef CONFIG_HIGHMEM 591#ifdef CONFIG_HIGHMEM
590 /* check that fixmap and pkmap do not overlap */ 592 /* check that fixmap and pkmap do not overlap */
591 if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) { 593 if (PKMAP_BASE + LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
592 printk(KERN_ERR "fixmap and kmap areas overlap - this will crash\n"); 594 printk(KERN_ERR
595 "fixmap and kmap areas overlap - this will crash\n");
593 printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n", 596 printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n",
594 PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE, FIXADDR_START); 597 PKMAP_BASE, PKMAP_BASE + LAST_PKMAP*PAGE_SIZE,
598 FIXADDR_START);
595 BUG(); 599 BUG();
596 } 600 }
597#endif 601#endif
@@ -628,7 +632,7 @@ void __init mem_init(void)
628 ); 632 );
629 633
630#if 1 /* double-sanity-check paranoia */ 634#if 1 /* double-sanity-check paranoia */
631 printk("virtual kernel memory layout:\n" 635 printk(KERN_INFO "virtual kernel memory layout:\n"
632 " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" 636 " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
633#ifdef CONFIG_HIGHMEM 637#ifdef CONFIG_HIGHMEM
634 " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n" 638 " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
@@ -756,13 +760,15 @@ void mark_rodata_ro(void)
756#endif 760#endif
757 { 761 {
758 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 762 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
759 printk("Write protecting the kernel text: %luk\n", size >> 10); 763 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
764 size >> 10);
760 765
761#ifdef CONFIG_CPA_DEBUG 766#ifdef CONFIG_CPA_DEBUG
762 printk("Testing CPA: Reverting %lx-%lx\n", start, start+size); 767 printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
768 start, start+size);
763 set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT); 769 set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT);
764 770
765 printk("Testing CPA: write protecting again\n"); 771 printk(KERN_INFO "Testing CPA: write protecting again\n");
766 set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT); 772 set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT);
767#endif 773#endif
768 } 774 }
@@ -770,15 +776,15 @@ void mark_rodata_ro(void)
770 start += size; 776 start += size;
771 size = (unsigned long)__end_rodata - start; 777 size = (unsigned long)__end_rodata - start;
772 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 778 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
773 printk("Write protecting the kernel read-only data: %luk\n", 779 printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
774 size >> 10); 780 size >> 10);
775 rodata_test(); 781 rodata_test();
776 782
777#ifdef CONFIG_CPA_DEBUG 783#ifdef CONFIG_CPA_DEBUG
778 printk("Testing CPA: undo %lx-%lx\n", start, start + size); 784 printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, start + size);
779 set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT); 785 set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
780 786
781 printk("Testing CPA: write protecting again\n"); 787 printk(KERN_INFO "Testing CPA: write protecting again\n");
782 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 788 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
783#endif 789#endif
784} 790}