diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 15:57:50 -0600 |
| commit | e6d7dcadf3d00f1eb60901cc2f6372bae1227666 (patch) | |
| tree | ba276253b4adb718753481388864ccb2793ceb25 /include/linux | |
| parent | 2903911952f2eba58ab6ca29e07d7bc5a2bed291 (diff) | |
UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/init.h | 2 | ||||
| -rw-r--r-- | include/linux/kmod.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index f6a7d3667e30..77c25233e40e 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -223,8 +223,6 @@ extern int initcall_debug; static initcall_t __initcall_##fn \ __used __section(.security_initcall.init) = fn -extern struct list_head populate_rootfs_domain; - struct obs_kernel_param { const char *str; int (*setup_func)(char *); diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 6efd7a78de6a..989fa3bae997 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -83,6 +83,8 @@ int call_usermodehelper_exec(struct subprocess_info *info, enum umh_wait wait); to call call_usermodehelper_exec */ void call_usermodehelper_freeinfo(struct subprocess_info *info); +extern void populate_rootfs_wait(void); + static inline int call_usermodehelper_fns(char *path, char **argv, char **envp, enum umh_wait wait, @@ -92,6 +94,8 @@ call_usermodehelper_fns(char *path, char **argv, char **envp, struct subprocess_info *info; gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; + populate_rootfs_wait(); + info = call_usermodehelper_setup(path, argv, envp, gfp_mask); if (info == NULL) |