diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-07-25 14:36:59 -0600 |
| commit | 8a61c90c3533f861f995c4224403a6ef8ae06b3d (patch) | |
| tree | b277d735d411a834d1e9e51a9208620d03eaa79f /include | |
| parent | c9270c9f7153be2e5bb074f6055992667bab5379 (diff) | |
UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'include')
| -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 47235b8436f..1d34396d4be 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 0da38cf7db7..8a02da82aa9 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -84,6 +84,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, @@ -93,6 +95,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) |