Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071361d3 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

mm: Convert print_symbol to %pSR 



Use the new vsprintf extension to avoid any possible
message interleaving.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7af584d3

mm/memory.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

}

mm/slab.c

+3 −5
Original line number Diff line number Diff line
@@ -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>]",

		printk(KERN_ERR "Last user: [<%p>](%pSR)\n",

		       *dbg_userword(cachep, objp),

		       *dbg_userword(cachep, objp));

		print_symbol("(%s)",

				(unsigned long)*dbg_userword(cachep, objp));

		printk("\n");

	}

	realobj = (char *)objp + obj_offset(cachep);

	size = cachep->object_size;