Commit 2521781c authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

mm/util.c: reduce mem_dump_obj() object size

Simplify the code by using a temporary and reduce the object size by
using a single call to pr_cont().  Reverse a test and unindent a block
too.

$ size mm/util.o* (defconfig x86-64)
   text	   data	    bss	    dec	    hex	filename
   7419	    372	     40	   7831	   1e97	mm/util.o.new
   7477	    372	     40	   7889	   1ed1	mm/util.o.old

Link: https://lkml.kernel.org/r/a6e105886338f68afd35f7a13d73bcf06b0cc732.camel@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e8003bf6
Loading
Loading
Loading
Loading
+14 −10
Original line number Diff line number Diff line
@@ -987,22 +987,26 @@ int __weak memcmp_pages(struct page *page1, struct page *page2)
 */
void mem_dump_obj(void *object)
{
	const char *type;

	if (kmem_valid_obj(object)) {
		kmem_dump_obj(object);
		return;
	}

	if (vmalloc_dump_obj(object))
		return;
	if (!virt_addr_valid(object)) {
		if (object == NULL)
			pr_cont(" NULL pointer.\n");

	if (virt_addr_valid(object))
		type = "non-slab/vmalloc memory";
	else if (object == NULL)
		type = "NULL pointer";
	else if (object == ZERO_SIZE_PTR)
			pr_cont(" zero-size pointer.\n");
		type = "zero-size pointer";
	else
			pr_cont(" non-paged memory.\n");
		return;
	}
	pr_cont(" non-slab/vmalloc memory.\n");
		type = "non-paged memory";

	pr_cont(" %s\n", type);
}
EXPORT_SYMBOL_GPL(mem_dump_obj);
#endif