summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-08-20 16:34:31 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-08-20 22:44:55 +0400
commitc4106d89453aacc831e8a1f1c96587de1305da4b (patch)
treeeaf55fd9dc9aed912f99524e37461c8f9d98339c
parent86efc7ec96c2a4330102a33f2cc40ae318909c8b (diff)
downloadlinux-topics-c4106d89453aacc831e8a1f1c96587de1305da4b.tar.gz
Revert 14d0790 "UBUNTU: SAUCE: async_populate_rootfs: fix build warnings"
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--init/initramfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index a9ea4066e2e..c5a41234666 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -589,7 +589,7 @@ void populate_rootfs_wait(void)
}
EXPORT_SYMBOL(populate_rootfs_wait);
-static void __init async_populate_rootfs(void *data, async_cookie_t cookie)
+static void __init async_populate_rootfs(void)
{
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
if (err)
@@ -638,14 +638,12 @@ 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);