Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[cascardo/linux.git] / include / linux / fault-inject.h

diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
index 32368c4..7b64ad4 100644 (file)
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@ -81,4 +81,14 @@ 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, unsigned long flags);
+#else
+static inline bool should_failslab(size_t size, gfp_t gfpflags,
+                               unsigned long flags)
+{
+       return false;
+}
+#endif /* CONFIG_FAILSLAB */
+
 #endif /* _LINUX_FAULT_INJECT_H */