The patch titled
Subject: slub: STACKDEPOT: rename save_stack_trace()
has been added to the -mm tree. Its filename is
mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Subject: slub: STACKDEPOT: rename save_stack_trace()
save_stack_trace() already exists, so change the one in
CONFIG_STACKDEPOT to be save_stack_depot_trace().
Fixes this build error:
../mm/slub.c:607:29: error: conflicting types for `save_stack_trace'
static depot_stack_handle_t save_stack_trace(gfp_t flags)
^~~~~~~~~~~~~~~~
In file included from ../include/linux/page_ext.h:6:0,
from ../include/linux/mm.h:25,
from ../mm/slub.c:13:
../include/linux/stacktrace.h:86:13: note: previous declaration of `save_stack_trace' was here
extern void save_stack_trace(struct stack_trace *trace);
^~~~~~~~~~~~~~~~
from this patch in mmotm:
Subject: mm/slub: use stackdepot to save stack trace in objects
Link: https://lkml.kernel.org/r/20210513051920.29320-1-rdunlap@xxxxxxxxxxxxx
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Acked-by: Oliver Glitta <glittao@xxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slub.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/mm/slub.c~mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix
+++ a/mm/slub.c
@@ -604,7 +604,7 @@ static struct track *get_track(struct km
}
#ifdef CONFIG_STACKDEPOT
-static depot_stack_handle_t save_stack_trace(gfp_t flags)
+static depot_stack_handle_t save_stack_depot_trace(gfp_t flags)
{
unsigned long entries[TRACK_ADDRS_COUNT];
depot_stack_handle_t handle;
@@ -623,7 +623,7 @@ static void set_track(struct kmem_cache
if (addr) {
#ifdef CONFIG_STACKDEPOT
- p->handle = save_stack_trace(GFP_KERNEL);
+ p->handle = save_stack_depot_trace(GFP_KERNEL);
#endif
p->addr = addr;
p->cpu = smp_processor_id();
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are
ia64-headers-drop-duplicated-words.patch
mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch
