diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:32 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:32 +0200 |
commit | 478ae70e7a36215f6f9ce0c4d8e9efe5e7d3c12d (patch) | |
tree | be5f4f8af937d25e8b556c167ad0a7f4117ebe29 /mm/slub.c | |
parent | 8e473a42efc317aefc593a48ba6631b9ec3a50c3 (diff) | |
parent | c10ab299f4c8758563311265f1b05da8c3dfd6ba (diff) |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
# Conflicts:
# drivers/acpi/sleep.c
# kernel/locking/lockdep.c
# kernel/time/timer.c
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index b1281b8654bd..0e02fd2ac19d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -691,7 +691,7 @@ static void print_section(char *level, char *text, u8 *addr, unsigned int length) { metadata_access_enable(); - print_hex_dump(level, text, DUMP_PREFIX_ADDRESS, + print_hex_dump(level, text, DUMP_PREFIX_OFFSET, 16, 1, kasan_reset_tag((void *)addr), length, 1); metadata_access_disable(); } |