2006-09-06 06:40:19

by Don Mullis

[permalink] [raw]
Subject: Re: [patch 2/6] fault-injection capability for kmalloc. [bug fix]

Fix compilation when CONFIG_FAILSLAB=n .

Signed-off-by: Don Mullis <[email protected]>

---
mm/slab.c | 2 ++
1 file changed, 2 insertions(+)

Index: linux-2.6.17/mm/slab.c
===================================================================
--- linux-2.6.17.orig/mm/slab.c
+++ linux-2.6.17/mm/slab.c
@@ -2985,9 +2985,11 @@ static inline void *____cache_alloc(stru
void *objp;
struct array_cache *ac;

+#ifdef CONFIG_FAILSLAB
if (!(flags & __GFP_NOFAIL) && cachep != &cache_cache &&
should_fail(failslab, obj_size(cachep)))
return NULL;
+#endif

#ifdef CONFIG_NUMA
if (unlikely(current->flags & (PF_SPREAD_SLAB | PF_MEMPOLICY))) {