From patchwork Tue Jul 13 12:51:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 58774 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 EBF94B6EEA for ; Tue, 13 Jul 2010 22:51:19 +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 1OYex6-0006Za-Px; Tue, 13 Jul 2010 13:51:12 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYex3-0006X5-AV for kernel-team@lists.ubuntu.com; Tue, 13 Jul 2010 13:51:09 +0100 Received: from [10.0.2.5] (unknown [10.0.2.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id CF05FB2D7F; Tue, 13 Jul 2010 05:50:57 -0700 (PDT) Message-ID: <4C3C6138.8010103@canonical.com> Date: Tue, 13 Jul 2010 06:51:04 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: Nicolas Pitre Subject: Re: [PATCH] fix build error with CONFIG_BLK_DEV_INITRD=n References: In-Reply-To: Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: tim.gardner@canonical.com 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 How about this instead (without ifdefs) ? rtg From 41d3a98d28ea7acf56e43f746abdb040eb2d96a8 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 13 Jul 2010 06:41:16 -0600 Subject: [PATCH] UBUNTU: SAUCE: fix build error with CONFIG_BLK_DEV_INITRD=n The original aynchronous boot patch (UBUNTU: SAUCE: Make populate_rootfs asynchronous) did not take into consideration the case when CONFIG_BLK_DEV_INITRD=n, e.g., populate_rootfs_domain becomes undefined. Therefore, add it to noinitramfs.c where its use is benign. Signed-off-by: Tim Gardner Original-patch-by: Nicolas Pitre Cc: Surbhi Palande --- init/noinitramfs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/init/noinitramfs.c b/init/noinitramfs.c index f4c1a3a..c2d8440 100644 --- a/init/noinitramfs.c +++ b/init/noinitramfs.c @@ -22,6 +22,8 @@ #include #include +LIST_HEAD(populate_rootfs_domain); + /* * Create a simple rootfs that is similar to the default initramfs */ -- 1.7.0.4