Commit f90e7185 authored by Christophe Lucas's avatar Christophe Lucas Committed by Linus Torvalds

[PATCH] printk: arch/i386/mm/pgtable.c

printk() calls should include appropriate KERN_* constant.
Signed-off-by: default avatarChristophe Lucas <clucas@rotomalug.org>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ee48dd57
...@@ -32,9 +32,9 @@ void show_mem(void) ...@@ -32,9 +32,9 @@ void show_mem(void)
unsigned long i; unsigned long i;
struct page_state ps; struct page_state ps;
printk("Mem-info:\n"); printk(KERN_INFO "Mem-info:\n");
show_free_areas(); show_free_areas();
printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_pgdat(pgdat) { for_each_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; ++i) { for (i = 0; i < pgdat->node_spanned_pages; ++i) {
page = pgdat_page_nr(pgdat, i); page = pgdat_page_nr(pgdat, i);
...@@ -49,18 +49,18 @@ void show_mem(void) ...@@ -49,18 +49,18 @@ void show_mem(void)
shared += page_count(page) - 1; shared += page_count(page) - 1;
} }
} }
printk("%d pages of RAM\n", total); printk(KERN_INFO "%d pages of RAM\n", total);
printk("%d pages of HIGHMEM\n",highmem); printk(KERN_INFO "%d pages of HIGHMEM\n", highmem);
printk("%d reserved pages\n",reserved); printk(KERN_INFO "%d reserved pages\n", reserved);
printk("%d pages shared\n",shared); printk(KERN_INFO "%d pages shared\n", shared);
printk("%d pages swap cached\n",cached); printk(KERN_INFO "%d pages swap cached\n", cached);
get_page_state(&ps); get_page_state(&ps);
printk("%lu pages dirty\n", ps.nr_dirty); printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);
printk("%lu pages writeback\n", ps.nr_writeback); printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
printk("%lu pages mapped\n", ps.nr_mapped); printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);
printk("%lu pages slab\n", ps.nr_slab); printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);
printk("%lu pages pagetables\n", ps.nr_page_table_pages); printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
} }
/* /*
...@@ -113,16 +113,16 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags) ...@@ -113,16 +113,16 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
pmd_t *pmd; pmd_t *pmd;
if (vaddr & (PMD_SIZE-1)) { /* vaddr is misaligned */ if (vaddr & (PMD_SIZE-1)) { /* vaddr is misaligned */
printk ("set_pmd_pfn: vaddr misaligned\n"); printk(KERN_WARNING "set_pmd_pfn: vaddr misaligned\n");
return; /* BUG(); */ return; /* BUG(); */
} }
if (pfn & (PTRS_PER_PTE-1)) { /* pfn is misaligned */ if (pfn & (PTRS_PER_PTE-1)) { /* pfn is misaligned */
printk ("set_pmd_pfn: pfn misaligned\n"); printk(KERN_WARNING "set_pmd_pfn: pfn misaligned\n");
return; /* BUG(); */ return; /* BUG(); */
} }
pgd = swapper_pg_dir + pgd_index(vaddr); pgd = swapper_pg_dir + pgd_index(vaddr);
if (pgd_none(*pgd)) { if (pgd_none(*pgd)) {
printk ("set_pmd_pfn: pgd_none\n"); printk(KERN_WARNING "set_pmd_pfn: pgd_none\n");
return; /* BUG(); */ return; /* BUG(); */
} }
pud = pud_offset(pgd, vaddr); pud = pud_offset(pgd, vaddr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment