From 7f3675457d17a0670590dfeb113f4f45d1e957a3 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 13 Jul 2021 15:09:19 +0100 Subject: [PATCH] ANDROID: mm: slab: Fix 'merge changes moved struct track' issue Local commit 1fb8e678a550c ("ANDROID: mm: add get_each_object_track function") moves 'struct track' from mm/slub.c to mm/slab.h to make it public. Then upstream commit 788691464c294 ("mm/slub: use stackdepot to save stack trace in objects") adapts the struct from its old location. For whatever reason this goes unnoticed by Git during the merge process and the change is lost into the ether. This patch replicates the change in the new location. Bug: 193130194 Fixes: 1fb8e678a550c ("ANDROID: mm: add get_each_object_track function") Fixes: 788691464c294 ("mm/slub: use stackdepot to save stack trace in objects") Signed-off-by: Lee Jones Change-Id: Ie9a3c3f6ccbf6434f06ffc4e1598f2d096a1fa94 --- mm/slab.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index f3f578ca9964..a3ecf309a0f8 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -98,8 +98,8 @@ gfp_t kmalloc_fix_flags(gfp_t flags); #define TRACK_ADDRS_COUNT 16 struct track { unsigned long addr; /* Called from address */ -#ifdef CONFIG_STACKTRACE - unsigned long addrs[TRACK_ADDRS_COUNT]; /* Called from address */ +#ifdef CONFIG_STACKDEPOT + depot_stack_handle_t handle; #endif int cpu; /* Was running on cpu */ int pid; /* Pid context */