Merge branch 'next' into for-linus

2011-05-24 22:55:24 +10:00
parent d762f43831 12a5a2621b
commit 434d42cfd0
25 changed files with 205 additions and 64 deletions
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/workqueue.h>
+#include <linux/sysctl.h>

 #define KMOD_PATH_LEN 256

@@ -109,6 +110,8 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
 				       NULL, NULL, NULL);
 }

+extern struct ctl_table usermodehelper_table[];
+
 extern void usermodehelper_init(void);

 extern int usermodehelper_disable(void);