From patchwork Tue May 22 18:23:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 160714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 36AF9B6FA0 for ; Wed, 23 May 2012 04:23:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SWtjf-0003r9-E5; Tue, 22 May 2012 18:23:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SWtjd-0003r4-Vw for kernel-team@lists.ubuntu.com; Tue, 22 May 2012 18:23:06 +0000 Received: from 189.114.238.165.dynamic.adsl.gvt.net.br ([189.114.238.165] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SWtjd-0004D7-BY for kernel-team@lists.ubuntu.com; Tue, 22 May 2012 18:23:05 +0000 From: Herton Ronaldo Krzesinski To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: async_populate_rootfs: fix build warnings Date: Tue, 22 May 2012 15:23:02 -0300 Message-Id: <1337710982-7439-1-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- init/initramfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Patch applies from Natty to Quantal. It's just build warnings, but if desired I can open a bug and do the formal SRU. diff --git a/init/initramfs.c b/init/initramfs.c index 2d47aca..da4e927 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);