* [merged] slub-drop-bogus-inline-for-fixup_red_left.patch removed from -mm tree
@ 2016-08-08 20:15 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2016-08-08 20:15 UTC (permalink / raw)
To: geert, glider, rientjes, mm-commits
The patch titled
Subject: slub: drop bogus inline for fixup_red_left()
has been removed from the -mm tree. Its filename was
slub-drop-bogus-inline-for-fixup_red_left.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Geert Uytterhoeven <geert@linux-m68k.org>
Subject: slub: drop bogus inline for fixup_red_left()
With m68k-linux-gnu-gcc-4.1:
include/linux/slub_def.h:126: warning: `fixup_red_left' declared inline after being called
include/linux/slub_def.h:126: warning: previous declaration of `fixup_red_left' was here
Commit c146a2b98eb5898e ("mm, kasan: account for object redzone in SLUB's
nearest_obj()") made fixup_red_left() global, but forgot to remove the
inline keyword.
Fixes: c146a2b98eb5898e ("mm, kasan: account for object redzone in SLUB's nearest_obj()")
Link: http://lkml.kernel.org/r/1470256262-1586-1-git-send-email-geert@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alexander Potapenko <glider@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/slub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/slub.c~slub-drop-bogus-inline-for-fixup_red_left mm/slub.c
--- a/mm/slub.c~slub-drop-bogus-inline-for-fixup_red_left
+++ a/mm/slub.c
@@ -124,7 +124,7 @@ static inline int kmem_cache_debug(struc
#endif
}
-inline void *fixup_red_left(struct kmem_cache *s, void *p)
+void *fixup_red_left(struct kmem_cache *s, void *p)
{
if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
p += s->red_left_pad;
_
Patches currently in -mm which might be from geert@linux-m68k.org are
mm-oom-fix-uninitialized-ret-in-task_will_free_mem.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-08 20:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-08 20:15 [merged] slub-drop-bogus-inline-for-fixup_red_left.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.