* [PATCH] MIPS: Add severity levels to printk statements during kernel setup. @ 2008-07-25 13:44 Mike Crowe 2008-07-25 18:04 ` Geert Uytterhoeven 0 siblings, 1 reply; 6+ messages in thread From: Mike Crowe @ 2008-07-25 13:44 UTC (permalink / raw) To: linux-mips Signed-off-by: Mike Crowe <mac@mcrowe.com> --- arch/mips/kernel/setup.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8af8486..fcb12b9 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) /* Sanity check */ if (start + size < start) { - printk("Trying to add an invalid memory region, skipped\n"); + printk(KERN_WARNING "Trying to add an invalid memory region, skipped\n"); return; } @@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) } if (x == BOOT_MEM_MAP_MAX) { - printk("Ooops! Too many entries in the memory map!\n"); + printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); return; } @@ -108,7 +108,7 @@ static void __init print_memory_map(void) const int field = 2 * sizeof(unsigned long); for (i = 0; i < boot_mem_map.nr_map; i++) { - printk(" memory: %0*Lx @ %0*Lx ", + printk(KERN_INFO " memory: %0*Lx @ %0*Lx ", field, (unsigned long long) boot_mem_map.map[i].size, field, (unsigned long long) boot_mem_map.map[i].addr); @@ -221,7 +221,7 @@ static void __init finalize_initrd(void) goto disable; } if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { - printk("Initrd extends beyond end of memory"); + printk(KERN_ERR "Initrd extends beyond end of memory"); goto disable; } @@ -232,7 +232,7 @@ static void __init finalize_initrd(void) initrd_start, size); return; disable: - printk(" - disabling initrd\n"); + printk(KERN_ERR " - disabling initrd\n"); initrd_start = 0; initrd_end = 0; } @@ -471,7 +471,7 @@ static void __init arch_mem_init(char **cmdline_p) /* call board setup routine */ plat_mem_setup(); - printk("Determined physical RAM map:\n"); + printk(KERN_INFO "Determined physical RAM map:\n"); print_memory_map(); strlcpy(command_line, arcs_cmdline, sizeof(command_line)); @@ -482,7 +482,7 @@ static void __init arch_mem_init(char **cmdline_p) parse_early_param(); if (usermem) { - printk("User-defined physical RAM map:\n"); + printk(KERN_INFO "User-defined physical RAM map:\n"); print_memory_map(); } -- 1.5.6 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS: Add severity levels to printk statements during kernel setup. 2008-07-25 13:44 [PATCH] MIPS: Add severity levels to printk statements during kernel setup Mike Crowe @ 2008-07-25 18:04 ` Geert Uytterhoeven 2008-07-26 12:59 ` Mike Crowe 0 siblings, 1 reply; 6+ messages in thread From: Geert Uytterhoeven @ 2008-07-25 18:04 UTC (permalink / raw) To: Mike Crowe; +Cc: linux-mips On Fri, 25 Jul 2008, Mike Crowe wrote: > Signed-off-by: Mike Crowe <mac@mcrowe.com> > --- > arch/mips/kernel/setup.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > index 8af8486..fcb12b9 100644 > --- a/arch/mips/kernel/setup.c > +++ b/arch/mips/kernel/setup.c > @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) > > /* Sanity check */ > if (start + size < start) { > - printk("Trying to add an invalid memory region, skipped\n"); > + printk(KERN_WARNING "Trying to add an invalid memory region, skipped\n"); Why not convert to pr_warning(), while you're at it? > @@ -221,7 +221,7 @@ static void __init finalize_initrd(void) > goto disable; > } > if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { > - printk("Initrd extends beyond end of memory"); > + printk(KERN_ERR "Initrd extends beyond end of memory"); ^ There's no newline here, so... > goto disable; > } > > @@ -232,7 +232,7 @@ static void __init finalize_initrd(void) > initrd_start, size); > return; > disable: > - printk(" - disabling initrd\n"); > + printk(KERN_ERR " - disabling initrd\n"); ^^^^^^^^ ... probably this should be KERN_CONT. Note that I didn't check the other paths to get here. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS: Add severity levels to printk statements during kernel setup. 2008-07-25 18:04 ` Geert Uytterhoeven @ 2008-07-26 12:59 ` Mike Crowe 2008-07-26 13:19 ` Geert Uytterhoeven 0 siblings, 1 reply; 6+ messages in thread From: Mike Crowe @ 2008-07-26 12:59 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: linux-mips On Fri, 25 Jul 2008, I wrote: >> --- a/arch/mips/kernel/setup.c >> +++ b/arch/mips/kernel/setup.c >> @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) >> >> /* Sanity check */ >> if (start + size < start) { >> - printk("Trying to add an invalid memory region, skipped\n"); >> + printk(KERN_WARNING "Trying to add an invalid memory region, skipped\n"); On Fri, Jul 25, 2008 at 08:04:57PM +0200, Geert Uytterhoeven wrote: > Why not convert to pr_warning(), while you're at it? I can do. I'm just a bit behind the times. :-) Should I use pr_{warning,err,info} everywhere rather than printk? Is it worth fixing up the other calls to printk that I didn't need to "fix"? >> @@ -221,7 +221,7 @@ static void __init finalize_initrd(void) >> goto disable; >> } >> if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { >> - printk("Initrd extends beyond end of memory"); >> + printk(KERN_ERR "Initrd extends beyond end of memory"); > ^ > There's no newline here, so... > >> goto disable; >> } >> >> @@ -232,7 +232,7 @@ static void __init finalize_initrd(void) >> initrd_start, size); >> return; >> disable: >> - printk(" - disabling initrd\n"); >> + printk(KERN_ERR " - disabling initrd\n"); > ^^^^^^^^ > ... probably this should be KERN_CONT. > Note that I didn't check the other paths to get here. Well spotted. I thought I'd checked those but obviously not carefully enough. I shall try again. Thanks. Mike. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS: Add severity levels to printk statements during kernel setup. 2008-07-26 12:59 ` Mike Crowe @ 2008-07-26 13:19 ` Geert Uytterhoeven 2008-07-28 12:12 ` [PATCH] MIPS: Convert printk statements during kernel setup to use severity levels Mike Crowe 0 siblings, 1 reply; 6+ messages in thread From: Geert Uytterhoeven @ 2008-07-26 13:19 UTC (permalink / raw) To: Mike Crowe; +Cc: linux-mips On Sat, 26 Jul 2008, Mike Crowe wrote: > On Fri, 25 Jul 2008, I wrote: > >> --- a/arch/mips/kernel/setup.c > >> +++ b/arch/mips/kernel/setup.c > >> @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) > >> > >> /* Sanity check */ > >> if (start + size < start) { > >> - printk("Trying to add an invalid memory region, skipped\n"); > >> + printk(KERN_WARNING "Trying to add an invalid memory region, skipped\n"); > > On Fri, Jul 25, 2008 at 08:04:57PM +0200, Geert Uytterhoeven wrote: > > Why not convert to pr_warning(), while you're at it? > > I can do. I'm just a bit behind the times. :-) > > Should I use pr_{warning,err,info} everywhere rather than printk? Is Yes, please. > it worth fixing up the other calls to printk that I didn't need to > "fix"? If you have the time, you can do that. It also makes those (typically too long) lines a bit shorter. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] MIPS: Convert printk statements during kernel setup to use severity levels 2008-07-26 13:19 ` Geert Uytterhoeven @ 2008-07-28 12:12 ` Mike Crowe 2008-07-30 13:49 ` Ralf Baechle 0 siblings, 1 reply; 6+ messages in thread From: Mike Crowe @ 2008-07-28 12:12 UTC (permalink / raw) To: linux-mips; +Cc: Geert Uytterhoeven Signed-off-by: Mike Crowe <mac@mcrowe.com> --- I've modified my original patch to use pr_* where appropriate. I've left the two groups that rely on KERN_CONT using printk directly because there is (understandably) no pr_cont. diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8af8486..2aae76b 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) /* Sanity check */ if (start + size < start) { - printk("Trying to add an invalid memory region, skipped\n"); + pr_warning("Trying to add an invalid memory region, skipped\n"); return; } @@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) } if (x == BOOT_MEM_MAP_MAX) { - printk("Ooops! Too many entries in the memory map!\n"); + pr_err("Ooops! Too many entries in the memory map!\n"); return; } @@ -108,22 +108,22 @@ static void __init print_memory_map(void) const int field = 2 * sizeof(unsigned long); for (i = 0; i < boot_mem_map.nr_map; i++) { - printk(" memory: %0*Lx @ %0*Lx ", + printk(KERN_INFO " memory: %0*Lx @ %0*Lx ", field, (unsigned long long) boot_mem_map.map[i].size, field, (unsigned long long) boot_mem_map.map[i].addr); switch (boot_mem_map.map[i].type) { case BOOT_MEM_RAM: - printk("(usable)\n"); + printk(KERN_CONT "(usable)\n"); break; case BOOT_MEM_ROM_DATA: - printk("(ROM data)\n"); + printk(KERN_CONT "(ROM data)\n"); break; case BOOT_MEM_RESERVED: - printk("(reserved)\n"); + printk(KERN_CONT "(reserved)\n"); break; default: - printk("type %lu\n", boot_mem_map.map[i].type); + printk(KERN_CONT "type %lu\n", boot_mem_map.map[i].type); break; } } @@ -185,11 +185,11 @@ static unsigned long __init init_initrd(void) sanitize: if (initrd_start & ~PAGE_MASK) { - printk(KERN_ERR "initrd start must be page aligned\n"); + pr_err("initrd start must be page aligned\n"); goto disable; } if (initrd_start < PAGE_OFFSET) { - printk(KERN_ERR "initrd start < PAGE_OFFSET\n"); + pr_err("initrd start < PAGE_OFFSET\n"); goto disable; } @@ -221,18 +221,18 @@ static void __init finalize_initrd(void) goto disable; } if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { - printk("Initrd extends beyond end of memory"); + printk(KERN_ERR "Initrd extends beyond end of memory"); goto disable; } reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); initrd_below_start_ok = 1; - printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", - initrd_start, size); + pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", + initrd_start, size); return; disable: - printk(" - disabling initrd\n"); + printk(KERN_CONT " - disabling initrd\n"); initrd_start = 0; initrd_end = 0; } @@ -310,14 +310,12 @@ static void __init bootmem_init(void) if (min_low_pfn >= max_low_pfn) panic("Incorrect memory mapping !!!"); if (min_low_pfn > ARCH_PFN_OFFSET) { - printk(KERN_INFO - "Wasting %lu bytes for tracking %lu unused pages\n", - (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), - min_low_pfn - ARCH_PFN_OFFSET); + pr_info("Wasting %lu bytes for tracking %lu unused pages\n", + (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), + min_low_pfn - ARCH_PFN_OFFSET); } else if (min_low_pfn < ARCH_PFN_OFFSET) { - printk(KERN_INFO - "%lu free pages won't be used\n", - ARCH_PFN_OFFSET - min_low_pfn); + pr_info("%lu free pages won't be used\n", + ARCH_PFN_OFFSET - min_low_pfn); } min_low_pfn = ARCH_PFN_OFFSET; @@ -471,7 +469,7 @@ static void __init arch_mem_init(char **cmdline_p) /* call board setup routine */ plat_mem_setup(); - printk("Determined physical RAM map:\n"); + pr_info("Determined physical RAM map:\n"); print_memory_map(); strlcpy(command_line, arcs_cmdline, sizeof(command_line)); @@ -482,7 +480,7 @@ static void __init arch_mem_init(char **cmdline_p) parse_early_param(); if (usermem) { - printk("User-defined physical RAM map:\n"); + pr_info("User-defined physical RAM map:\n"); print_memory_map(); } -- 1.5.6 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] MIPS: Convert printk statements during kernel setup to use severity levels 2008-07-28 12:12 ` [PATCH] MIPS: Convert printk statements during kernel setup to use severity levels Mike Crowe @ 2008-07-30 13:49 ` Ralf Baechle 0 siblings, 0 replies; 6+ messages in thread From: Ralf Baechle @ 2008-07-30 13:49 UTC (permalink / raw) To: Mike Crowe; +Cc: linux-mips, Geert Uytterhoeven On Mon, Jul 28, 2008 at 01:12:52PM +0100, Mike Crowe wrote: > From: Mike Crowe <mac@mcrowe.com> > Date: Mon, 28 Jul 2008 13:12:52 +0100 > To: linux-mips@linux-mips.org > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Subject: [PATCH] MIPS: Convert printk statements during kernel setup to use > severity levels > Content-Type: text/plain; charset=us-ascii > > Signed-off-by: Mike Crowe <mac@mcrowe.com> Thanks, applied. Ralf ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-30 13:49 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-07-25 13:44 [PATCH] MIPS: Add severity levels to printk statements during kernel setup Mike Crowe 2008-07-25 18:04 ` Geert Uytterhoeven 2008-07-26 12:59 ` Mike Crowe 2008-07-26 13:19 ` Geert Uytterhoeven 2008-07-28 12:12 ` [PATCH] MIPS: Convert printk statements during kernel setup to use severity levels Mike Crowe 2008-07-30 13:49 ` Ralf Baechle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox