From patchwork Tue Jul 13 04:55:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 58772 X-Patchwork-Delegate: leann.ogasawara@canonical.com 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 2CB53B6F1A for ; Tue, 13 Jul 2010 21:54:23 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYe3x-0004Gc-Pw; Tue, 13 Jul 2010 12:54:13 +0100 Received: from mail-vw0-f49.google.com ([209.85.212.49]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYXX7-0000NW-Ok for kernel-team@lists.ubuntu.com; Tue, 13 Jul 2010 05:55:53 +0100 Received: by vws8 with SMTP id 8so5448281vws.8 for ; Mon, 12 Jul 2010 21:55:53 -0700 (PDT) Received: by 10.229.192.6 with SMTP id do6mr8891007qcb.109.1278996952830; Mon, 12 Jul 2010 21:55:52 -0700 (PDT) Received: from xanadu.home (modemcable092.28-130-66.mc.videotron.ca [66.130.28.92]) by mx.google.com with ESMTPS id e32sm23009540qcg.34.2010.07.12.21.55.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 12 Jul 2010 21:55:52 -0700 (PDT) Date: Tue, 13 Jul 2010 00:55:51 -0400 (EDT) From: Nicolas Pitre X-X-Sender: nico@xanadu.home To: kernel-team@lists.ubuntu.com Subject: [PATCH] fix build error with CONFIG_BLK_DEV_INITRD=n Message-ID: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Jul 2010 12:54:12 +0100 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com populate_rootfs_domain is defined in init/initramfs.c which gets compiled only if CONFIG_BLK_DEV_INITRD=y. Signed-off-by: Nicolas Pitre --- Would be a good idea to fold in the patch from commit 1b40343e, or better yet, find a cleaner solution. diff --git a/init/main.c b/init/main.c index 3fe1a78..fbe7a22 100644 --- a/init/main.c +++ b/init/main.c @@ -926,11 +926,13 @@ static int __init kernel_init(void * unused) (void) sys_dup(0); (void) sys_dup(0); +#ifdef CONFIG_BLK_DEV_INITRD /* * We need to ensure that the filesystem is ready by this point, wait for * async_populate_rootfs to complete. */ async_synchronize_full_domain(&populate_rootfs_domain); +#endif /* * check if there is an early userspace init. If yes, let it do all