Some printk cleanup in mm
Subsystems (5)
PATCH v3 1/1 Some printk cleanup in mm
This series cleans up some printks in the mm code that were missing log levels.
Changelog:
- v3: Leaving slub.c alone. It's using hand-tagged printk's correctly so it's probably just churn to convert everything to the pr_ macros.
- v2: Suggestions by Joe Perches (pr_fmt, pr_cont, pr_err, __func__, missing \n)
Mitchel Humpherys (1):
mm: convert some level-less printks to pr_*
mm/bounce.c | 7 +++++-- mm/mempolicy.c | 5 ++++- mm/mmap.c | 21 ++++++++++++--------- mm/nommu.c | 5 ++++- mm/vmscan.c | 5 ++++- 5 files changed, 29 insertions(+), 14 deletions(-)
Signature · 8 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v3 1/1 mm: convert some level-less printks to pr_*
printk is meant to be used with an associated log level. There are some instances of printk scattered around the mm code where the log level is missing. Add a log level and adhere to suggestions by scripts/checkpatch.pl by moving to the pr_* macros.
Signed-off-by Mitchel Humpherys <[email protected]>
--- mm/bounce.c | 7 +++++-- mm/mempolicy.c | 5 ++++- mm/mmap.c | 21 ++++++++++++--------- mm/nommu.c | 5 ++++- mm/vmscan.c | 5 ++++- 5 files changed, 29 insertions(+), 14 deletions(-)
mm/bounce.c +5 -2
@@ -3,6 +3,8 @@* - Split from highmem.c */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/mm.h> #include <linux/export.h> #include <linux/swap.h>
@@ -15,6 +17,7 @@#include <linux/hash.h> #include <linux/highmem.h> #include <linux/bootmem.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <trace/events/block.h>
@@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) page_pool =mempool_create_page_pool (POOL_SIZE ,0 );BUG_ON (!page_pool); -printk ("bounce pool size: %d pages\n" ,POOL_SIZE ); +pr_info ("bounce pool size: %d pages\n" ,POOL_SIZE );return 0 ; }
@@ -86,7 +89,7 @@ int init_emergency_isa_pool(void) mempool_free_pages, (void *) 0);BUG_ON (!isa_page_pool); -printk ("isa bounce pool size: %d pages\n" ,ISA_POOL_SIZE ); +pr_info ("isa bounce pool size: %d pages\n" ,ISA_POOL_SIZE );return 0 ; }
mm/mempolicy.c +4 -1
@@ -65,6 +65,8 @@kernel is not always grateful with that. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/mempolicy.h> #include <linux/mm.h> #include <linux/highmem.h>
@@ -91,6 +93,7 @@#include <linux/ctype.h> #include <linux/mm_inline.h> #include <linux/mmu_notifier.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/uaccess.h>
@@ -2679,7 +2682,7 @@ void __init numa_policy_init(void)node_set (prefer, interleave_nodes);if (do_set_mempolicy (MPOL_INTERLEAVE ,0 , &interleave_nodes)) -printk ("numa_policy_init: interleaving failed\n" ); +pr_err ("%s: interleaving failed\n" , __func__);check_numabalancing_enable (); }
mm/mmap.c +12 -9
@@ -6,6 +6,8 @@* Address space accounting code <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/slab.h> #include <linux/backing-dev.h>
@@ -36,6 +38,7 @@#include <linux/sched/sysctl.h> #include <linux/notifier.h> #include <linux/memory.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/cacheflush.h>
@@ -360,20 +363,20 @@ static int browse_rb(struct rb_root *root)struct vm_area_struct *vma; vma = rb_entry(nd, struct vm_area_struct, vm_rb);if (vma->vm_start < prev) { -printk ("vm_start %lx prev %lx\n" , vma->vm_start, prev); +pr_info ("vm_start %lx prev %lx\n" , vma->vm_start, prev); bug =1 ; }if (vma->vm_start < pend) { -printk ("vm_start %lx pend %lx\n" , vma->vm_start, pend); +pr_info ("vm_start %lx pend %lx\n" , vma->vm_start, pend); bug =1 ; }if (vma->vm_start > vma->vm_end) { -printk ("vm_end %lx < vm_start %lx\n" , +pr_info ("vm_end %lx < vm_start %lx\n" , vma->vm_end, vma->vm_start); bug =1 ; }if (vma->rb_subtree_gap !=vma_compute_subtree_gap (vma)) { -printk ("free gap %lx, correct %lx\n" , +pr_info ("free gap %lx, correct %lx\n" , vma->rb_subtree_gap,vma_compute_subtree_gap (vma)); bug =1 ;
@@ -387,7 +390,7 @@ static int browse_rb(struct rb_root *root)for (nd = pn; nd; nd =rb_prev (nd)) j++;if (i != j) { -printk ("backwards %d, forwards %d\n" , j, i); +pr_info ("backwards %d, forwards %d\n" , j, i); bug =1 ; }return bug ?-1 : i;
@@ -422,17 +425,17 @@ static void validate_mm(struct mm_struct *mm) i++; }if (i != mm->map_count) { -printk ("map_count %d vm_next %d\n" , mm->map_count, i); +pr_info ("map_count %d vm_next %d\n" , mm->map_count, i); bug =1 ; }if (highest_address != mm->highest_vm_end) { -printk ("mm->highest_vm_end %lx, found %lx\n" , +pr_info ("mm->highest_vm_end %lx, found %lx\n" , mm->highest_vm_end, highest_address); bug =1 ; } i =browse_rb (&mm->mm_rb);if (i != mm->map_count) { -printk ("map_count %d rb %d\n" , mm->map_count, i); +pr_info ("map_count %d rb %d\n" , mm->map_count, i); bug =1 ; }BUG_ON (bug);
@@ -3249,7 +3252,7 @@ static struct notifier_block reserve_mem_nb = {static int __meminit init_reserve_notifier (void ) {if (register_hotmemory_notifier (&reserve_mem_nb)) -printk ("Failed registering memory add/remove notifier for admin reserve" ); +pr_err ("Failed registering memory add/remove notifier for admin reserve\n" );return 0 ; }
mm/nommu.c +4 -1
@@ -13,6 +13,8 @@* Copyright (c) 2007-2010 Paul Mundt <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/export.h> #include <linux/mm.h> #include <linux/mman.h>
@@ -30,6 +32,7 @@#include <linux/syscalls.h> #include <linux/audit.h> #include <linux/sched/sysctl.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/tlb.h>
@@ -1241,7 +1244,7 @@ error_free:return ret; enomem: -printk ("Allocation of length %lu from process %d (%s) failed\n" , +pr_err ("Allocation of length %lu from process %d (%s) failed\n" , len, current->pid, current->comm);show_free_areas (0 );return -ENOMEM ;
mm/vmscan.c +4 -1
@@ -11,6 +11,8 @@* Multiqueue VM started 5.8.00, Rik van Riel. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/mm.h> #include <linux/module.h> #include <linux/gfp.h>
@@ -43,6 +45,7 @@#include <linux/sysctl.h> #include <linux/oom.h> #include <linux/prefetch.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/div64.h>
@@ -477,7 +480,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,if (page_has_private (page)) {if (try_to_free_buffers (page)) {ClearPageDirty (page); -printk ("%s: orphaned page\n" , __func__); +pr_info ("%s: orphaned page\n" , __func__);return PAGE_CLEAN ; } }
Signature · 8 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 3 lines · Mitchel Humpherys
- v3: Leaving
slub.calone. It's using hand-tagged printk's correctly so it's probably just churn to convert everything to thepr_macros.
Ok.
Ignored-by Christoph Lameter <[email protected]>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>