diff options
| author | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2012-05-22 15:23:02 -0300 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 15:04:12 -0600 |
| commit | f92587caa305b169ebd062598a9c039d4520a67d (patch) | |
| tree | c7b09a0bdc58a22d45aadb493c9d08f131cc9a77 | |
| parent | d4a0853fcd75ba60714c7667ded2193a8a6ccd1d (diff) | |
UBUNTU: SAUCE: async_populate_rootfs: fix build warnings
BugLink: http://bugs.launchpad.net/bugs/1003417
Fix following build warnings:
init/initramfs.c: In function 'populate_rootfs_early':
init/initramfs.c:629:7: warning: passing argument 1 of 'async_schedule_domain' from incompatible pointer type [enabled by default]
include/linux/async.h:20:23: note: expected 'void (*)(void *, async_cookie_t)' but argument is of type 'void (*)(void)'
init/initramfs.c:631:1: warning: no return statement in function returning non-void [-Wreturn-type]
init/initramfs.c: In function 'populate_rootfs':
init/initramfs.c:636:7: warning: passing argument 1 of 'async_schedule_domain' from incompatible pointer type [enabled by default]
include/linux/async.h:20:23: note: expected 'void (*)(void *, async_cookie_t)' but argument is of type 'void (*)(void)'
init/initramfs.c:637:1: warning: no return statement in function returning non-void [-Wreturn-type]
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -rw-r--r-- | init/initramfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index b33d6aee82f..8712b8377e7 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -579,7 +579,7 @@ void populate_rootfs_wait(void) } EXPORT_SYMBOL(populate_rootfs_wait); -static void __init async_populate_rootfs(void) +static void __init async_populate_rootfs(void *data, async_cookie_t cookie) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); if (err) @@ -628,12 +628,14 @@ static int __init populate_rootfs_early(void) async_schedule_domain(async_populate_rootfs, NULL, &populate_rootfs_domain); } + return 0; } static int __init populate_rootfs(void) { if (!rootfs_populated) async_schedule_domain(async_populate_rootfs, NULL, &populate_rootfs_domain); + return 0; } earlyrootfs_initcall(populate_rootfs_early); |