diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 15:02:16 -0600 |
| commit | f7fce02c90068d9677bef26c41737fbd0104eda9 (patch) | |
| tree | 5a72e7dfc8f36d45ae1684c732e3fbb62492801e /include | |
| parent | 8ace2e95c58fe9dce6eaf0c9e57a3106b21094eb (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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ad021e87d5a..bc7379f6625 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -224,8 +224,6 @@ extern bool 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 5398d580707..6f571b1be39 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -71,6 +71,8 @@ call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, int (*init)(struct subprocess_info *info, struct cred *new), void (*cleanup)(struct subprocess_info *), void *data); +void populate_rootfs_wait(void); + static inline int call_usermodehelper(char *path, char **argv, char **envp, int wait) { |