---

yaml --- r: 43766 b: refs/heads/master c: 6b1b60f h: refs/heads/master v: v3
git-mirror · Dec 8, 2006 · bca3c08 · bca3c08
1 parent f728121
commit bca3c08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1729c28a37e4f11ea5d9f468ab26adadb1aadab
+refs/heads/master: 6b1b60f41eef3ba7b188fd72f1d6de478aafd93c
diff --git a/trunk/include/linux/fault-inject.h b/trunk/include/linux/fault-inject.h
@@ -52,6 +52,7 @@ struct fault_attr {
 		.times = ATOMIC_INIT(1),			\
 		.require_end = ULONG_MAX,			\
 		.stacktrace_depth = 32,				\
+		.verbose = 2,					\
 	}
 
 #define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER

diff --git a/trunk/mm/page_alloc.c b/trunk/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/trunk/mm/slab.c b/trunk/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)