2 files changed, 3 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0cc8b4376e91..e6b17b2989e0 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -910,6 +910,8 @@ static struct fail_page_alloc_attr {
 
 } fail_page_alloc = {
         .attr = FAULT_ATTR_INITIALIZER,
+        .ignore_gfp_wait = 1,
+        .ignore_gfp_highmem = 1,
 };
 
 static int __init setup_fail_page_alloc(char *str)
diff --git a/mm/slab.c b/mm/slab.c
index 47011e2ef3c9..56af694c9e6a 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3102,6 +3102,7 @@ static struct failslab_attr {
 
 } failslab = {
         .attr = FAULT_ATTR_INITIALIZER,
+        .ignore_gfp_wait = 1,
 };
 
 static int __init setup_failslab(char *str)