diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-08-15 23:45:55 -0600 |
| commit | bc3f32c3a499b3e1d0c94688556de0fc6eea4d4e (patch) | |
| tree | 769baac3f67a6257fc6ccab63be29f0d896c6e2e /include | |
| parent | a3eb21936baf33198a5c56e0cb5fa0447b98e87a (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 b8540f0988c..d8ed250fce3 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -225,8 +225,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) { |