moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: mm: slab: Fix 'merge changes moved struct track' issue

Browse Source 
Local commit 1fb8e678a5 ("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 788691464c ("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: 1fb8e678a5 ("ANDROID: mm: add get_each_object_track function")
Fixes: 788691464c ("mm/slub: use stackdepot to save stack trace in objects")
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: Ie9a3c3f6ccbf6434f06ffc4e1598f2d096a1fa94
This commit is contained in:
Lee Jones
2021-07-13 15:09:19 +01:00
parent fc5e50e6a3
commit 7f3675457d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mm/slab.h
View File

@@ -98,8 +98,8 @@ gfp_t kmalloc_fix_flags(gfp_t flags);
#define TRACK_ADDRS_COUNT 16 #define TRACK_ADDRS_COUNT 16
struct track { struct track {
unsigned long addr; /* Called from address */ unsigned long addr; /* Called from address */
#ifdef CONFIG_STACKTRACE #ifdef CONFIG_STACKDEPOT
unsigned long addrs[TRACK_ADDRS_COUNT]; /* Called from address */ depot_stack_handle_t handle;
#endif #endif
int cpu; /* Was running on cpu */ int cpu; /* Was running on cpu */
int pid; /* Pid context */ int pid; /* Pid context */