aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2010-07-13 06:41:16 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-06-22 17:16:37 -0600
commit5d1aaa4d0d902837d6c8ca99dc653943b8707eda (patch)
treea3987b7867d82e9be990679476e879303b474855 /init
parent236cf3f5e339c6a5c03baff06c4227bed89d9816 (diff)
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> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'init')
-rw-r--r--init/noinitramfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/init/noinitramfs.c b/init/noinitramfs.c
index 267739d8517..e0f648cad6e 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
*/