Patchwork fix build error with CONFIG_BLK_DEV_INITRD=n

login
register
mail settings
Submitter Tim Gardner
Date July 13, 2010, 12:51 p.m.
Message ID <4C3C6138.8010103@canonical.com>
Download mbox | patch
Permalink /patch/58774/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Tim Gardner - July 13, 2010, 12:51 p.m.
How about this instead (without ifdefs) ?

rtg
Nicolas Pitre - July 13, 2010, 12:59 p.m.
On Tue, 13 Jul 2010, Tim Gardner wrote:

> How about this instead (without ifdefs) ?

ACK.  I knew someone would find a better solution. I just did the 
minimum to get the issue out of my way.


Nicolas
Leann Ogasawara - July 13, 2010, 5:18 p.m.
Applied to Maverick linux master.

Thanks,
Leann

On Tue, 2010-07-13 at 06:51 -0600, Tim Gardner wrote:
> How about this instead (without ifdefs) ?
> 
> rtg

Patch

From 41d3a98d28ea7acf56e43f746abdb040eb2d96a8 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
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 <tim.gardner@canonical.com>
Original-patch-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Surbhi Palande <surbhi.palande@canonical.com>
---
 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 <linux/kdev_t.h>
 #include <linux/syscalls.h>
 
+LIST_HEAD(populate_rootfs_domain);
+
 /*
  * Create a simple rootfs that is similar to the default initramfs
  */
-- 
1.7.0.4