ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL mainboard

[karo-tx-linux.git] / mm / failslab.c

diff --git a/mm/failslab.c b/mm/failslab.c
index 79171b4a58269986491198403a322d6c2a7dc814..b0fac98cd9388941db02a3985d98b32d37b307dd 100644 (file)
--- a/mm/failslab.c
+++ b/mm/failslab.c
@@ -1,5 +1,7 @@
 #include <linux/fault-inject.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
+#include "slab.h"
 
 static struct {
        struct fault_attr attr;
@@ -11,18 +13,22 @@ static struct {
        .cache_filter = false,
 };
 
-bool should_failslab(size_t size, gfp_t gfpflags, unsigned long cache_flags)
+bool should_failslab(struct kmem_cache *s, gfp_t gfpflags)
 {
+       /* No fault-injection for bootstrap cache */
+       if (unlikely(s == kmem_cache))
+               return false;
+
        if (gfpflags & __GFP_NOFAIL)
                return false;
 
        if (failslab.ignore_gfp_reclaim && (gfpflags & __GFP_RECLAIM))
                return false;
 
-       if (failslab.cache_filter && !(cache_flags & SLAB_FAILSLAB))
+       if (failslab.cache_filter && !(s->flags & SLAB_FAILSLAB))
                return false;
 
-       return should_fail(&failslab.attr, size);
+       return should_fail(&failslab.attr, s->object_size);
 }
 
 static int __init setup_failslab(char *str)