aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2012-10-16 10:59:59 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-11-14 18:19:38 -0700
commit857f83bf6449f644fdd098e203d7dbf6c60f97cb (patch)
tree8521a8e82a40dd6c6221d623dec5339d46b50394
parentfe3c60f34d68a9b7033f547376f60ffc02b512e6 (diff)
Revert "UBUNTU: SAUCE: async_populate_rootfs: fix build warnings"
This reverts commit 0a90b6744d02f80da605874534eacaed58195173.
-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);