From bca3c08eacc646ff2203043cc6b75f02f2dadea1 Mon Sep 17 00:00:00 2001 From: Don Mullis Date: Fri, 8 Dec 2006 02:39:53 -0800 Subject: [PATCH] --- yaml --- r: 43766 b: refs/heads/master c: 6b1b60f41eef3ba7b188fd72f1d6de478aafd93c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fault-inject.h | 1 + trunk/mm/page_alloc.c | 2 ++ trunk/mm/slab.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f115a4177268..701f63aba98a 100644 --- 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 index c77067916b7e..32368c4f0326 100644 --- 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 index 0cc8b4376e91..e6b17b2989e0 100644 --- 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 index 47011e2ef3c9..56af694c9e6a 100644 --- 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)