diff options
| author | Joe Perches <joe@perches.com> | 2012-12-12 10:19:12 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-29 15:24:33 +0200 |
| commit | 071361d3473ebb8142907470ff12d59c59f6be72 (patch) | |
| tree | cebdd2bd5cf478c86c1d113f358267a42b0c4413 /mm | |
| parent | 7af584d3b0e0ba025562198e6bfbff3c0fe1f17e (diff) | |
| download | lwn-071361d3473ebb8142907470ff12d59c59f6be72.tar.gz lwn-071361d3473ebb8142907470ff12d59c59f6be72.zip | |
mm: Convert print_symbol to %pSR
Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 8 | ||||
| -rw-r--r-- | mm/slab.c | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mm/memory.c b/mm/memory.c index 494526ae024a..a64c2114616c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -714,11 +714,11 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y */ if (vma->vm_ops) - print_symbol(KERN_ALERT "vma->vm_ops->fault: %s\n", - (unsigned long)vma->vm_ops->fault); + printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n", + vma->vm_ops->fault); if (vma->vm_file && vma->vm_file->f_op) - print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n", - (unsigned long)vma->vm_file->f_op->mmap); + printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n", + vma->vm_file->f_op->mmap); dump_stack(); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); } diff --git a/mm/slab.c b/mm/slab.c index 856e4a192d25..96079244c860 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2040,11 +2040,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines) } if (cachep->flags & SLAB_STORE_USER) { - printk(KERN_ERR "Last user: [<%p>]", - *dbg_userword(cachep, objp)); - print_symbol("(%s)", - (unsigned long)*dbg_userword(cachep, objp)); - printk("\n"); + printk(KERN_ERR "Last user: [<%p>](%pSR)\n", + *dbg_userword(cachep, objp), + *dbg_userword(cachep, objp)); } realobj = (char *)objp + obj_offset(cachep); size = cachep->object_size; |