Kernel 5.0.5

openbmc · May 5, 2019 · 9dcfdd8 · 9dcfdd8
1 parent 213056d
commit 9dcfdd8
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/mm/slub.c b/mm/slub.c
@@ -135,11 +135,6 @@ static inline bool has_sanitize_verify(struct kmem_cache *s)
 	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
 }
 
-static inline bool has_sanitize_verify(struct kmem_cache *s)
-{
-	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
-}
-
 void *fixup_red_left(struct kmem_cache *s, void *p)
 {
 	if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
@@ -3060,12 +3055,8 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
 
 			if (sanitize) {
 				memset(x + offset, 0, s->object_size - offset);
-<<<<<<< HEAD
 				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) &&
 				    s->ctor)
-=======
-				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && s->ctor)
->>>>>>> slub: add multi-purpose random canaries
 					s->ctor(x);
 			}
 			if (x == tail_obj)