diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:09 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:09 +0200 |
| commit | e5088b2366d5b9791788fb4a24169b1d2303f664 (patch) | |
| tree | 7c40d367026b23f2bf28057cc449c7bed03b7f9d /mm/slub.c | |
| parent | 3c4bc522478def9883dff4c957574ddf6115c5c7 (diff) | |
| parent | b56d8d7bad86a9badc1d1b9ea2d1730fa1d3978b (diff) | |
Merge remote-tracking branch 'drm_intel_push/topic/core-for-CI' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/i915_pci.c
# drivers/gpu/drm/i915/intel_device_info.c
# include/drm/i915_pciids.h
# net/sched/sch_generic.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 261474092e43..7e0be2b400a1 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -689,7 +689,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(); } |