summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2021-05-05 04:38:32 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-05 21:27:25 +0300
commit2521781c1ebc6d26b7fbe9b7e9614fd2f38affb5 (patch)
tree35c90cb8af6f3e0f61f49b9900cf0a2f3888f3b1 /mm
parente8003bf66a7a66d8ae3db2c40b2dca180bf942bb (diff)
downloadlinux-2521781c1ebc6d26b7fbe9b7e9614fd2f38affb5.tar.xz
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: Joe Perches <joe@perches.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/util.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/mm/util.c b/mm/util.c
index 083c5c417cfc..972e7a0cda5e 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -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");
- else if (object == ZERO_SIZE_PTR)
- pr_cont(" zero-size pointer.\n");
- else
- pr_cont(" non-paged memory.\n");
- return;
- }
- pr_cont(" non-slab/vmalloc memory.\n");
+
+ if (virt_addr_valid(object))
+ type = "non-slab/vmalloc memory";
+ else if (object == NULL)
+ type = "NULL pointer";
+ else if (object == ZERO_SIZE_PTR)
+ type = "zero-size pointer";
+ else
+ type = "non-paged memory";
+
+ pr_cont(" %s\n", type);
}
EXPORT_SYMBOL_GPL(mem_dump_obj);
#endif