5 files changed, 96 insertions, 25 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a3f83e2c8250..ad33c979e0b3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -192,6 +192,24 @@ config TASK_DELAY_ACCT
 
           Say N if unsure.
 
+config TASK_XACCT
+        bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+        depends on TASKSTATS
+        help
+          Collect extended task accounting data and send the data
+          to userland for processing over the taskstats interface.
+
+          Say N if unsure.
+
+config TASK_IO_ACCOUNTING
+        bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
+        depends on TASK_XACCT
+        help
+          Collect information on the number of bytes of storage I/O which this
+          task has caused.
+
+          Say N if unsure.
+
 config UTS_NS
         bool "UTS Namespaces"
         default n
@@ -280,8 +298,12 @@ config RELAY
 
           If unsure, say N.
 
+if BLK_DEV_INITRD
+
 source "usr/Kconfig"
 
+endif
+
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size (Look out for broken compilers!)"
         default y
@@ -295,24 +317,6 @@ config CC_OPTIMIZE_FOR_SIZE
 
           If unsure, say N.
 
-config TASK_XACCT
-        bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
-        depends on TASKSTATS
-        help
-          Collect extended task accounting data and send the data
-          to userland for processing over the taskstats interface.
-
-          Say N if unsure.
-
-config TASK_IO_ACCOUNTING
-        bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
-        depends on TASK_XACCT
-        help
-          Collect information on the number of bytes of storage I/O which this
-          task has caused.
-
-          Say N if unsure.
-
 config SYSCTL
         bool
 
diff --git a/init/Makefile b/init/Makefile
index 633a268d270d..0154aea1e52d 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -2,7 +2,12 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                           := main.o version.o mounts.o initramfs.o
+obj-y                          := main.o version.o mounts.o
+ifneq ($(CONFIG_BLK_DEV_INITRD),y)
+obj-y                          += noinitramfs.o
+else
+obj-$(CONFIG_BLK_DEV_INITRD)   += initramfs.o
+endif
 obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
 
 mounts-y                        := do_mounts.o
diff --git a/init/initramfs.c b/init/initramfs.c
index 4fa0f7977de1..00eff7a11085 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -491,6 +491,17 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
         return message;
 }
 
+static int __initdata do_retain_initrd;
+
+static int __init retain_initrd_param(char *str)
+{
+        if (*str)
+                return 0;
+        do_retain_initrd = 1;
+        return 1;
+}
+__setup("retain_initrd", retain_initrd_param);
+
 extern char __initramfs_start[], __initramfs_end[];
 #ifdef CONFIG_BLK_DEV_INITRD
 #include <linux/initrd.h>
@@ -501,7 +512,11 @@ static void __init free_initrd(void)
 #ifdef CONFIG_KEXEC
         unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
         unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
+#endif
+        if (do_retain_initrd)
+                goto skip;
 
+#ifdef CONFIG_KEXEC
         /*
          * If the initrd region is overlapped with crashkernel reserved region,
          * free only memory that is not part of crashkernel region.
@@ -519,7 +534,7 @@ static void __init free_initrd(void)
         } else
 #endif
                 free_initrd_mem(initrd_start, initrd_end);
-
+skip:
         initrd_start = 0;
         initrd_end = 0;
 }
diff --git a/init/main.c b/init/main.c
index 8b4a7d769162..4e88bddfbebf 100644
--- a/init/main.c
+++ b/init/main.c
@@ -395,11 +395,6 @@ static void __init smp_init(void)
         /* Any cleanup work */
         printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
         smp_cpus_done(max_cpus);
-#if 0
-        /* Get other processors into their bootup holding patterns. */
-
-        smp_commence();
-#endif
 }
 
 #endif
diff --git a/init/noinitramfs.c b/init/noinitramfs.c
new file mode 100644
index 000000000000..f4c1a3a1b8c5
--- /dev/null
+++ b/init/noinitramfs.c
@@ -0,0 +1,52 @@
+/*
+ * init/noinitramfs.c
+ *
+ * Copyright (C) 2006, NXP Semiconductors, All Rights Reserved
+ * Author: Jean-Paul Saman <jean-paul.saman@nxp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/init.h>
+#include <linux/stat.h>
+#include <linux/kdev_t.h>
+#include <linux/syscalls.h>
+
+/*
+ * Create a simple rootfs that is similar to the default initramfs
+ */
+static int __init default_rootfs(void)
+{
+        int err;
+
+        err = sys_mkdir("/dev", 0755);
+        if (err < 0)
+                goto out;
+
+        err = sys_mknod((const char __user *) "/dev/console",
+                        S_IFCHR | S_IRUSR | S_IWUSR,
+                        new_encode_dev(MKDEV(5, 1)));
+        if (err < 0)
+                goto out;
+
+        err = sys_mkdir("/root", 0700);
+        if (err < 0)
+                goto out;
+
+        return 0;
+
+out:
+        printk(KERN_WARNING "Failed to create a rootfs\n");
+        return err;
+}
+rootfs_initcall(default_rootfs);