Merge branch 'akpm'

diff --cc include/linux/fault-inject.h
index 3ff060ac7810586d93685942195dc386fdcc0f69,f1945d6bcaa8a2fea195070e703b81a8fcd26200..c6f996f2abb6c552345884760bfc5d5967d40bdb
--- 1/include/linux/fault-inject.h
--- 2/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@@ -50,14 -46,10 +46,10 @@@ struct dentry *fault_create_debugfs_att
  
  #else /* CONFIG_FAULT_INJECTION_DEBUG_FS */
  
- static inline int init_fault_attr_dentries(struct fault_attr *attr,
-                                         const char *name)
- {
-       return -ENODEV;
- }
- 
- static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)
+ static inline struct dentry *fault_create_debugfs_attr(const char *name,
 -                      struct dentry *parent, struct fault_attr *attr);
++                      struct dentry *parent, struct fault_attr *attr)
  {
+       return ERR_PTR(-ENODEV);
  }
  
  #endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */