fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / kmod.h

diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 7c5af18..10f505c 100644 (file)
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -19,10 +19,12 @@
  *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
+#include <linux/stddef.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
 
+#define KMOD_PATH_LEN 256
+
 #ifdef CONFIG_KMOD
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
@@ -32,10 +34,21 @@ static inline int request_module(const char * name, ...) { return -ENOSYS; }
 #endif
 
 #define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
-extern int call_usermodehelper(char *path, char *argv[], char *envp[], int wait);
 
-#ifdef CONFIG_HOTPLUG
-extern char hotplug_path [];
-#endif
+struct key;
+extern int call_usermodehelper_keys(char *path, char *argv[], char *envp[],
+                                   struct key *session_keyring, int wait);
+
+static inline int
+call_usermodehelper(char *path, char **argv, char **envp, int wait)
+{
+       return call_usermodehelper_keys(path, argv, envp, NULL, wait);
+}
+
+extern void usermodehelper_init(void);
+
+struct file;
+extern int call_usermodehelper_pipe(char *path, char *argv[], char *envp[],
+                                   struct file **filp);
 
 #endif /* __LINUX_KMOD_H__ */