提交 071361d3 编写于 作者: J Joe Perches 提交者: Jiri Kosina

mm: Convert print_symbol to %pSR

Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: NJoe Perches <joe@perches.com>
Acked-by: NChristoph Lameter <cl@linux.com>
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 7af584d3
...@@ -714,11 +714,11 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, ...@@ -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 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
*/ */
if (vma->vm_ops) if (vma->vm_ops)
print_symbol(KERN_ALERT "vma->vm_ops->fault: %s\n", printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
(unsigned long)vma->vm_ops->fault); vma->vm_ops->fault);
if (vma->vm_file && vma->vm_file->f_op) if (vma->vm_file && vma->vm_file->f_op)
print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n", printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
(unsigned long)vma->vm_file->f_op->mmap); vma->vm_file->f_op->mmap);
dump_stack(); dump_stack();
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
} }
......
...@@ -2040,11 +2040,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines) ...@@ -2040,11 +2040,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines)
} }
if (cachep->flags & SLAB_STORE_USER) { if (cachep->flags & SLAB_STORE_USER) {
printk(KERN_ERR "Last user: [<%p>]", printk(KERN_ERR "Last user: [<%p>](%pSR)\n",
*dbg_userword(cachep, objp)); *dbg_userword(cachep, objp),
print_symbol("(%s)", *dbg_userword(cachep, objp));
(unsigned long)*dbg_userword(cachep, objp));
printk("\n");
} }
realobj = (char *)objp + obj_offset(cachep); realobj = (char *)objp + obj_offset(cachep);
size = cachep->object_size; size = cachep->object_size;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册