| Message ID | 20210513051920.29320-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-mm] slub: STACKDEPOT: rename save_stack_trace() | expand |
št 13. 5. 2021 o 7:19 Randy Dunlap <rdunlap@infradead.org> napísal(a): > > 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 > > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Oliver Glitta <glittao@gmail.com> I run it with CONFIG_ARCH_STACKWALK set on, so it didn't show this error. Thank you for your fix. > Cc: Oliver Glitta <glittao@gmail.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org > --- > mm/slub.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > --- mmotm-2021-0512-2146.orig/mm/slub.c > +++ mmotm-2021-0512-2146/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();
--- mmotm-2021-0512-2146.orig/mm/slub.c +++ mmotm-2021-0512-2146/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();
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 Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Oliver Glitta <glittao@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org --- mm/slub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)