The patch titled
Subject: mm-dont-call-should_failslab-for-config_failslab-fix
has been removed from the -mm tree. Its filename was
mm-dont-call-should_failslab-for-config_failslab-fix.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-dont-call-should_failslab-for-config_failslab-fix
avoid ifdefs
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/fault-inject.h | 4 ++++
mm/slab.h | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
--- a/include/linux/fault-inject.h~mm-dont-call-should_failslab-for-config_failslab-fix
+++ a/include/linux/fault-inject.h
@@ -68,6 +68,10 @@ struct kmem_cache;
int should_failslab(struct kmem_cache *s, gfp_t gfpflags);
extern bool __should_failslab(struct kmem_cache *s, gfp_t gfpflags);
#else
+static inline int should_failslab(struct kmem_cache *s, gfp_t gfpflags)
+{
+ return 0;
+}
static inline bool __should_failslab(struct kmem_cache *s, gfp_t gfpflags)
{
return false;
--- a/mm/slab.h~mm-dont-call-should_failslab-for-config_failslab-fix
+++ a/mm/slab.h
@@ -491,10 +491,8 @@ static inline struct kmem_cache *slab_pr
might_alloc(flags);
-#ifdef CONFIG_FAILSLAB
if (should_failslab(s, flags))
return NULL;
-#endif
if (!memcg_slab_pre_alloc_hook(s, objcgp, size, flags))
return NULL;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
procfs-do-not-list-tid-0-in-proc-pid-task-fix.patch
ipc-check-checkpoint_restore_ns_capable-to-modify-c-r-proc-files-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
