diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 11:47:05 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 11:47:05 +0200 |
| commit | 3c506efd7e0f615bd9603ce8c06bc4a896952599 (patch) | |
| tree | 6ebc840535e9d93bf60e21e940a5f4558275a89d /include | |
| parent | fd37617e69fb865348d012eb1413aef0141ae2de (diff) | |
| parent | 773ff60e841461cb1f9374a713ffcda029b8c317 (diff) | |
Merge branch 'topic/failslab' into for-linus
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fault-inject.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h index 32368c4f032..06ca9b21dad 100644 --- a/include/linux/fault-inject.h +++ b/include/linux/fault-inject.h @@ -81,4 +81,13 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr) #endif /* CONFIG_FAULT_INJECTION */ +#ifdef CONFIG_FAILSLAB +extern bool should_failslab(size_t size, gfp_t gfpflags); +#else +static inline bool should_failslab(size_t size, gfp_t gfpflags) +{ + return false; +} +#endif /* CONFIG_FAILSLAB */ + #endif /* _LINUX_FAULT_INJECT_H */ |