Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

8 files changed, 103 insertions, 153 deletions

diff --git a/usr/Kconfig b/usr/Kconfig
index e2721f5a3504..65b845bd4e3e 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -46,7 +46,7 @@ config INITRAMFS_ROOT_GID
           If you are not sure, leave it set to "0".
 
 config RD_GZIP
-        bool "Support initial ramdisks compressed using gzip" if EMBEDDED
+        bool "Support initial ramdisks compressed using gzip" if EXPERT
         default y
         depends on BLK_DEV_INITRD
         select DECOMPRESS_GZIP
@@ -55,8 +55,8 @@ config RD_GZIP
           If unsure, say Y.
 
 config RD_BZIP2
-        bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using bzip2" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_BZIP2
         help
@@ -64,17 +64,26 @@ config RD_BZIP2
           If unsure, say N.
 
 config RD_LZMA
-        bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using LZMA" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZMA
         help
           Support loading of a LZMA encoded initial ramdisk or cpio buffer
           If unsure, say N.
 
+config RD_XZ
+        bool "Support initial ramdisks compressed using XZ" if EXPERT
+        default !EXPERT
+        depends on BLK_DEV_INITRD
+        select DECOMPRESS_XZ
+        help
+          Support loading of a XZ encoded initial ramdisk or cpio buffer.
+          If unsure, say N.
+
 config RD_LZO
-        bool "Support initial ramdisks compressed using LZO" if EMBEDDED
-        default !EMBEDDED
+        bool "Support initial ramdisks compressed using LZO" if EXPERT
+        default !EXPERT
         depends on BLK_DEV_INITRD
         select DECOMPRESS_LZO
         help
@@ -139,12 +148,21 @@ config INITRAMFS_COMPRESSION_LZMA
           three. Compression is slowest. The initramfs size is about 33%
           smaller with LZMA in comparison to gzip.
 
+config INITRAMFS_COMPRESSION_XZ
+        bool "XZ"
+        depends on RD_XZ
+        help
+          XZ uses the LZMA2 algorithm. The initramfs size is about 30%
+          smaller with XZ in comparison to gzip. Decompression speed
+          is better than that of bzip2 but worse than gzip and LZO.
+          Compression is slow.
+
 config INITRAMFS_COMPRESSION_LZO
         bool "LZO"
         depends on RD_LZO
         help
           Its compression ratio is the poorest among the four. The kernel
-          size is about about 10% bigger than gzip; however its speed
+          size is about 10% bigger than gzip; however its speed
           (both compression and decompression) is the fastest.
 
 endchoice
diff --git a/usr/Makefile b/usr/Makefile
index 6b4b6da0b67d..029ffe6cd0d8 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -15,16 +15,21 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_BZIP2)  = .bz2
 # Lzma
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZMA)   = .lzma
 
+# XZ
+suffix_$(CONFIG_INITRAMFS_COMPRESSION_XZ)     = .xz
+
 # Lzo
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo
 
+AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
+
 # Generate builtin.o based on initramfs_data.o
-obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data$(suffix_y).o
+obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
 
 # initramfs_data.o contains the compressed initramfs_data.cpio image.
 # The image is included using .incbin, a dependency which is not
 # tracked automatically.
-$(obj)/initramfs_data$(suffix_y).o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
+$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
 
 #####
 # Generate the initramfs cpio archive
@@ -48,7 +53,7 @@ endif
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
-targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.lzo initramfs_data.cpio
+targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
 # do not try to update files included in initramfs
 $(deps_initramfs): ;
 
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index b2b3c2d1cf8b..af0f22fb1ef7 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -22,6 +22,7 @@
 
 static unsigned int offset;
 static unsigned int ino = 721;
+static time_t default_mtime;
 
 struct file_handler {
         const char *type;
@@ -102,8 +103,9 @@ static int cpio_mkslink(const char *name, const char *target,
                          unsigned int mode, uid_t uid, gid_t gid)
 {
         char s[256];
-        time_t mtime = time(NULL);
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -112,7 +114,7 @@ static int cpio_mkslink(const char *name, const char *target,
                 (long) uid,             /* uid */
                 (long) gid,             /* gid */
                 1,                      /* nlink */
-                (long) mtime,           /* mtime */
+                (long) default_mtime,   /* mtime */
                 (unsigned)strlen(target)+1, /* filesize */
                 3,                      /* major */
                 1,                      /* minor */
@@ -150,8 +152,9 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
                        uid_t uid, gid_t gid)
 {
         char s[256];
-        time_t mtime = time(NULL);
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -160,7 +163,7 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
                 (long) uid,             /* uid */
                 (long) gid,             /* gid */
                 2,                      /* nlink */
-                (long) mtime,           /* mtime */
+                (long) default_mtime,   /* mtime */
                 0,                      /* filesize */
                 3,                      /* major */
                 1,                      /* minor */
@@ -238,13 +241,14 @@ static int cpio_mknod(const char *name, unsigned int mode,
                        unsigned int maj, unsigned int min)
 {
         char s[256];
-        time_t mtime = time(NULL);
 
         if (dev_type == 'b')
                 mode |= S_IFBLK;
         else
                 mode |= S_IFCHR;
 
+        if (name[0] == '/')
+                name++;
         sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                "%08X%08X%08X%08X%08X%08X%08X",
                 "070701",               /* magic */
@@ -253,7 +257,7 @@ static int cpio_mknod(const char *name, unsigned int mode,
                 (long) uid,             /* uid */
                 (long) gid,             /* gid */
                 1,                      /* nlink */
-                (long) mtime,           /* mtime */
+                (long) default_mtime,   /* mtime */
                 0,                      /* filesize */
                 3,                      /* major */
                 1,                      /* minor */
@@ -303,18 +307,18 @@ static int cpio_mkfile(const char *name, const char *location,
 
         mode |= S_IFREG;
 
-        retval = stat (location, &buf);
-        if (retval) {
-                fprintf (stderr, "File %s could not be located\n", location);
-                goto error;
-        }
-
         file = open (location, O_RDONLY);
         if (file < 0) {
                 fprintf (stderr, "File %s could not be opened for reading\n", location);
                 goto error;
         }
 
+        retval = fstat(file, &buf);
+        if (retval) {
+                fprintf(stderr, "File %s could not be stat()'ed\n", location);
+                goto error;
+        }
+
         filebuf = malloc(buf.st_size);
         if (!filebuf) {
                 fprintf (stderr, "out of memory\n");
@@ -332,6 +336,8 @@ static int cpio_mkfile(const char *name, const char *location,
                 /* data goes on last link */
                 if (i == nlinks) size = buf.st_size;
 
+                if (name[0] == '/')
+                        name++;
                 namesize = strlen(name) + 1;
                 sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
                        "%08lX%08X%08X%08X%08X%08X%08X",
@@ -452,7 +458,7 @@ static int cpio_mkfile_line(const char *line)
 static void usage(const char *prog)
 {
         fprintf(stderr, "Usage:\n"
-                "\t%s <cpio_list>\n"
+                "\t%s [-t <timestamp>] <cpio_list>\n"
                 "\n"
                 "<cpio_list> is a file containing newline separated entries that\n"
                 "describe the files to be included in the initramfs archive:\n"
@@ -483,7 +489,11 @@ static void usage(const char *prog)
                 "nod /dev/console 0600 0 0 c 5 1\n"
                 "dir /root 0700 0 0\n"
                 "dir /sbin 0755 0 0\n"
-                "file /sbin/kinit /usr/src/klibc/kinit/kinit 0755 0 0\n",
+                "file /sbin/kinit /usr/src/klibc/kinit/kinit 0755 0 0\n"
+                "\n"
+                "<timestamp> is time in seconds since Epoch that will be used\n"
+                "as mtime for symlinks, special files and directories. The default\n"
+                "is to use the current time for these entries.\n",
                 prog);
 }
 
@@ -521,17 +531,42 @@ int main (int argc, char *argv[])
         char *args, *type;
         int ec = 0;
         int line_nr = 0;
+        const char *filename;
 
-        if (2 != argc) {
+        default_mtime = time(NULL);
+        while (1) {
+                int opt = getopt(argc, argv, "t:h");
+                char *invalid;
+
+                if (opt == -1)
+                        break;
+                switch (opt) {
+                case 't':
+                        default_mtime = strtol(optarg, &invalid, 10);
+                        if (!*optarg || *invalid) {
+                                fprintf(stderr, "Invalid timestamp: %s\n",
+                                                optarg);
+                                usage(argv[0]);
+                                exit(1);
+                        }
+                        break;
+                case 'h':
+                case '?':
+                        usage(argv[0]);
+                        exit(opt == 'h' ? 0 : 1);
+                }
+        }
+
+        if (argc - optind != 1) {
                 usage(argv[0]);
                 exit(1);
         }
-
-        if (!strcmp(argv[1], "-"))
+        filename = argv[optind];
+        if (!strcmp(filename, "-"))
                 cpio_list = stdin;
-        else if (! (cpio_list = fopen(argv[1], "r"))) {
+        else if (!(cpio_list = fopen(filename, "r"))) {
                 fprintf(stderr, "ERROR: unable to open '%s': %s\n\n",
-                        argv[1], strerror(errno));
+                        filename, strerror(errno));
                 usage(argv[0]);
                 exit(1);
         }
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
index 7c6973d8d829..c14322d1c0cf 100644
--- a/usr/initramfs_data.S
+++ b/usr/initramfs_data.S
@@ -11,11 +11,7 @@
   -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
    ld -m elf_i386  -r -o built-in.o initramfs_data.o
 
-  initramfs_data.scr looks like this:
-SECTIONS
-{
-       .init.ramfs : { *(.data) }
-}
+  For including the .init.ramfs sections, see include/asm-generic/vmlinux.lds.
 
   The above example is for i386 - the parameters vary from architectures.
   Eventually look up LDFLAGS_BLOB in an older version of the
@@ -25,6 +21,18 @@ SECTIONS
   in the ELF header, as required by certain architectures.
 */
 
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio"
+#include <linux/stringify.h>
+#include <asm-generic/vmlinux.lds.h>
 
+.section .init.ramfs,"a"
+__irf_start:
+.incbin __stringify(INITRAMFS_IMAGE)
+__irf_end:
+.section .init.ramfs.info,"a"
+.globl VMLINUX_SYMBOL(__initramfs_size)
+VMLINUX_SYMBOL(__initramfs_size):
+#ifdef CONFIG_64BIT
+        .quad __irf_end - __irf_start
+#else
+        .long __irf_end - __irf_start
+#endif
diff --git a/usr/initramfs_data.bz2.S b/usr/initramfs_data.bz2.S
deleted file mode 100644
index bc54d090365c..000000000000
--- a/usr/initramfs_data.bz2.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  initramfs_data includes the compressed binary that is the
-  filesystem used for early user space.
-  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-  released on 2001-07-14) dit not support .incbin.
-  If you are forced to use older binutils than that then the
-  following trick can be applied to create the resulting binary:
-
-
-  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-
-  initramfs_data.scr looks like this:
-SECTIONS
-{
-       .init.ramfs : { *(.data) }
-}
-
-  The above example is for i386 - the parameters vary from architectures.
-  Eventually look up LDFLAGS_BLOB in an older version of the
-  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-
-  Using .incbin has the advantage over ld that the correct flags are set
-  in the ELF header, as required by certain architectures.
-*/
-
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio.bz2"
diff --git a/usr/initramfs_data.gz.S b/usr/initramfs_data.gz.S
deleted file mode 100644
index 890c8dd1d6bd..000000000000
--- a/usr/initramfs_data.gz.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  initramfs_data includes the compressed binary that is the
-  filesystem used for early user space.
-  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-  released on 2001-07-14) dit not support .incbin.
-  If you are forced to use older binutils than that then the
-  following trick can be applied to create the resulting binary:
-
-
-  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-
-  initramfs_data.scr looks like this:
-SECTIONS
-{
-       .init.ramfs : { *(.data) }
-}
-
-  The above example is for i386 - the parameters vary from architectures.
-  Eventually look up LDFLAGS_BLOB in an older version of the
-  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-
-  Using .incbin has the advantage over ld that the correct flags are set
-  in the ELF header, as required by certain architectures.
-*/
-
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio.gz"
diff --git a/usr/initramfs_data.lzma.S b/usr/initramfs_data.lzma.S
deleted file mode 100644
index e11469e48562..000000000000
--- a/usr/initramfs_data.lzma.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  initramfs_data includes the compressed binary that is the
-  filesystem used for early user space.
-  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-  released on 2001-07-14) dit not support .incbin.
-  If you are forced to use older binutils than that then the
-  following trick can be applied to create the resulting binary:
-
-
-  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-
-  initramfs_data.scr looks like this:
-SECTIONS
-{
-       .init.ramfs : { *(.data) }
-}
-
-  The above example is for i386 - the parameters vary from architectures.
-  Eventually look up LDFLAGS_BLOB in an older version of the
-  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-
-  Using .incbin has the advantage over ld that the correct flags are set
-  in the ELF header, as required by certain architectures.
-*/
-
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio.lzma"
diff --git a/usr/initramfs_data.lzo.S b/usr/initramfs_data.lzo.S
deleted file mode 100644
index 59211905da84..000000000000
--- a/usr/initramfs_data.lzo.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  initramfs_data includes the compressed binary that is the
-  filesystem used for early user space.
-  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
-  released on 2001-07-14) dit not support .incbin.
-  If you are forced to use older binutils than that then the
-  following trick can be applied to create the resulting binary:
-
-
-  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
-  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
-   ld -m elf_i386  -r -o built-in.o initramfs_data.o
-
-  initramfs_data.scr looks like this:
-SECTIONS
-{
-       .init.ramfs : { *(.data) }
-}
-
-  The above example is for i386 - the parameters vary from architectures.
-  Eventually look up LDFLAGS_BLOB in an older version of the
-  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
-
-  Using .incbin has the advantage over ld that the correct flags are set
-  in the ELF header, as required by certain architectures.
-*/
-
-.section .init.ramfs,"a"
-.incbin "usr/initramfs_data.cpio.lzo"