6 files changed, 102 insertions, 25 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c11da38837e5..5ceff3249a2d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -713,6 +713,14 @@ config SHMEM
           option replaces shmem and tmpfs with the much simpler ramfs code,
           which may be appropriate on small systems without swap.
 
+config AIO
+        bool "Enable AIO support" if EMBEDDED
+        default y
+        help
+          This option enables POSIX asynchronous I/O which may by used
+          by some high performance threaded applications. Disabling
+          this option saves about 7k.
+
 config VM_EVENT_COUNTERS
         default y
         bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
@@ -779,16 +787,6 @@ config MARKERS
 
 source "arch/Kconfig"
 
-config PROC_PAGE_MONITOR
-        default y
-        depends on PROC_FS && MMU
-        bool "Enable /proc page monitoring" if EMBEDDED
-        help
-          Various /proc files exist to monitor process memory utilization:
-          /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
-          /proc/kpagecount, and /proc/kpageflags. Disabling these
-          interfaces will reduce the size of the kernel by approximately 4kb.
-
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3715feb8446d..d055b1914c3d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -263,6 +263,10 @@ retry:
                 printk("Please append a correct \"root=\" boot option; here are the available partitions:\n");
 
                 printk_all_partitions();
+#ifdef CONFIG_DEBUG_BLOCK_EXT_DEVT
+                printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify "
+                       "explicit textual name for \"root=\" boot option.\n");
+#endif
                 panic("VFS: Unable to mount root fs on %s", b);
         }
 
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 693d24694a6c..4c87ee1fe5d3 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -1,5 +1,6 @@
 
 #include <linux/raid/md.h>
+#include <linux/delay.h>
 
 #include "do_mounts.h"
 
@@ -12,7 +13,12 @@
  * The code for that is here.
  */
 
-static int __initdata raid_noautodetect, raid_autopart;
+#ifdef CONFIG_MD_AUTODETECT
+static int __initdata raid_noautodetect;
+#else
+static int __initdata raid_noautodetect=1;
+#endif
+static int __initdata raid_autopart;
 
 static struct {
         int minor;
@@ -252,6 +258,8 @@ static int __init raid_setup(char *str)
 
                 if (!strncmp(str, "noautodetect", wlen))
                         raid_noautodetect = 1;
+                if (!strncmp(str, "autodetect", wlen))
+                        raid_noautodetect = 0;
                 if (strncmp(str, "partitionable", wlen)==0)
                         raid_autopart = 1;
                 if (strncmp(str, "part", wlen)==0)
@@ -264,17 +272,32 @@ static int __init raid_setup(char *str)
 __setup("raid=", raid_setup);
 __setup("md=", md_setup);
 
+static void autodetect_raid(void)
+{
+        int fd;
+
+        /*
+         * Since we don't want to detect and use half a raid array, we need to
+         * wait for the known devices to complete their probing
+         */
+        printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
+        printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
+        while (driver_probe_done() < 0)
+                msleep(100);
+        fd = sys_open("/dev/md0", 0, 0);
+        if (fd >= 0) {
+                sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
+                sys_close(fd);
+        }
+}
+
 void __init md_run_setup(void)
 {
         create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
+
         if (raid_noautodetect)
-                printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
-        else {
-                int fd = sys_open("/dev/md0", 0, 0);
-                if (fd >= 0) {
-                        sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
-                        sys_close(fd);
-                }
-        }
+                printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=autodetect will force)\n");
+        else
+                autodetect_raid();
         md_setup_drive();
 }
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index fedef93b586f..a7c748fa977a 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -71,7 +71,7 @@ identify_ramdisk_image(int fd, int start_block)
         sys_read(fd, buf, size);
 
         /*
-         * If it matches the gzip magic numbers, return -1
+         * If it matches the gzip magic numbers, return 0
          */
         if (buf[0] == 037 && ((buf[1] == 0213) || (buf[1] == 0236))) {
                 printk(KERN_NOTICE
diff --git a/init/initramfs.c b/init/initramfs.c
index 644fc01ad5f0..4f5ba75aaa7c 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -6,6 +6,7 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/syscalls.h>
+#include <linux/utime.h>
 
 static __initdata char *message;
 static void __init error(char *x)
@@ -72,6 +73,49 @@ static void __init free_hash(void)
         }
 }
 
+static long __init do_utime(char __user *filename, time_t mtime)
+{
+        struct timespec t[2];
+
+        t[0].tv_sec = mtime;
+        t[0].tv_nsec = 0;
+        t[1].tv_sec = mtime;
+        t[1].tv_nsec = 0;
+
+        return do_utimes(AT_FDCWD, filename, t, AT_SYMLINK_NOFOLLOW);
+}
+
+static __initdata LIST_HEAD(dir_list);
+struct dir_entry {
+        struct list_head list;
+        char *name;
+        time_t mtime;
+};
+
+static void __init dir_add(const char *name, time_t mtime)
+{
+        struct dir_entry *de = kmalloc(sizeof(struct dir_entry), GFP_KERNEL);
+        if (!de)
+                panic("can't allocate dir_entry buffer");
+        INIT_LIST_HEAD(&de->list);
+        de->name = kstrdup(name, GFP_KERNEL);
+        de->mtime = mtime;
+        list_add(&de->list, &dir_list);
+}
+
+static void __init dir_utime(void)
+{
+        struct dir_entry *de, *tmp;
+        list_for_each_entry_safe(de, tmp, &dir_list, list) {
+                list_del(&de->list);
+                do_utime(de->name, de->mtime);
+                kfree(de->name);
+                kfree(de);
+        }
+}
+
+static __initdata time_t mtime;
+
 /* cpio header parsing */
 
 static __initdata unsigned long ino, major, minor, nlink;
@@ -97,6 +141,7 @@ static void __init parse_header(char *s)
         uid = parsed[2];
         gid = parsed[3];
         nlink = parsed[4];
+        mtime = parsed[5];
         body_len = parsed[6];
         major = parsed[7];
         minor = parsed[8];
@@ -130,6 +175,7 @@ static inline void __init eat(unsigned n)
         count -= n;
 }
 
+static __initdata char *vcollected;
 static __initdata char *collected;
 static __initdata int remains;
 static __initdata char *collect;
@@ -271,6 +317,7 @@ static int __init do_name(void)
                         if (wfd >= 0) {
                                 sys_fchown(wfd, uid, gid);
                                 sys_fchmod(wfd, mode);
+                                vcollected = kstrdup(collected, GFP_KERNEL);
                                 state = CopyFile;
                         }
                 }
@@ -278,12 +325,14 @@ static int __init do_name(void)
                 sys_mkdir(collected, mode);
                 sys_chown(collected, uid, gid);
                 sys_chmod(collected, mode);
+                dir_add(collected, mtime);
         } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
                    S_ISFIFO(mode) || S_ISSOCK(mode)) {
                 if (maybe_link() == 0) {
                         sys_mknod(collected, mode, rdev);
                         sys_chown(collected, uid, gid);
                         sys_chmod(collected, mode);
+                        do_utime(collected, mtime);
                 }
         }
         return 0;
@@ -294,6 +343,8 @@ static int __init do_copy(void)
         if (count >= body_len) {
                 sys_write(wfd, victim, body_len);
                 sys_close(wfd);
+                do_utime(vcollected, mtime);
+                kfree(vcollected);
                 eat(body_len);
                 state = SkipIt;
                 return 0;
@@ -311,6 +362,7 @@ static int __init do_symlink(void)
         clean_path(collected, 0);
         sys_symlink(collected + N_ALIGN(name_len), collected);
         sys_lchown(collected, uid, gid);
+        do_utime(collected, mtime);
         state = SkipIt;
         next_state = Reset;
         return 0;
@@ -466,6 +518,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
                 buf += inptr;
                 len -= inptr;
         }
+        dir_utime();
         kfree(window);
         kfree(name_buf);
         kfree(symlink_buf);
diff --git a/init/main.c b/init/main.c
index f6f7042331dc..27f6bf6108e9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -708,7 +708,7 @@ int do_one_initcall(initcall_t fn)
         int result;
 
         if (initcall_debug) {
-                print_fn_descriptor_symbol("calling  %s\n", fn);
+                printk("calling  %pF @ %i\n", fn, task_pid_nr(current));
                 t0 = ktime_get();
         }
 
@@ -718,8 +718,8 @@ int do_one_initcall(initcall_t fn)
                 t1 = ktime_get();
                 delta = ktime_sub(t1, t0);
 
-                print_fn_descriptor_symbol("initcall %s", fn);
-                printk(" returned %d after %Ld msecs\n", result,
+                printk("initcall %pF returned %d after %Ld msecs\n",
+                        fn, result,
                         (unsigned long long) delta.tv64 >> 20);
         }
 
@@ -737,8 +737,7 @@ int do_one_initcall(initcall_t fn)
                 local_irq_enable();
         }
         if (msgbuf[0]) {
-                print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn);
-                printk(" returned with %s\n", msgbuf);
+                printk("initcall %pF returned with %s\n", fn, msgbuf);
         }
 
         return result;