5 files changed, 72 insertions, 13 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 7d30240e5bfe..7000d9657402 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -20,12 +20,8 @@ config CONSTRUCTORS
         bool
         depends on !UML
 
-config HAVE_IRQ_WORK
-        bool
-
 config IRQ_WORK
         bool
-        depends on HAVE_IRQ_WORK
 
 config BUILDTIME_EXTABLE_SORT
         bool
@@ -326,10 +322,13 @@ source "kernel/time/Kconfig"
 
 menu "CPU/Task time and stats accounting"
 
+config VIRT_CPU_ACCOUNTING
+        bool
+
 choice
         prompt "Cputime accounting"
         default TICK_CPU_ACCOUNTING if !PPC64
-        default VIRT_CPU_ACCOUNTING if PPC64
+        default VIRT_CPU_ACCOUNTING_NATIVE if PPC64
 
 # Kind of a stub config for the pure tick based cputime accounting
 config TICK_CPU_ACCOUNTING
@@ -342,9 +341,10 @@ config TICK_CPU_ACCOUNTING
 
           If unsure, say Y.
 
-config VIRT_CPU_ACCOUNTING
+config VIRT_CPU_ACCOUNTING_NATIVE
         bool "Deterministic task and CPU time accounting"
         depends on HAVE_VIRT_CPU_ACCOUNTING
+        select VIRT_CPU_ACCOUNTING
         help
           Select this option to enable more accurate task and CPU time
           accounting.  This is done by reading a CPU counter on each
@@ -354,6 +354,23 @@ config VIRT_CPU_ACCOUNTING
           this also enables accounting of stolen time on logically-partitioned
           systems.
 
+config VIRT_CPU_ACCOUNTING_GEN
+        bool "Full dynticks CPU time accounting"
+        depends on HAVE_CONTEXT_TRACKING && 64BIT
+        select VIRT_CPU_ACCOUNTING
+        select CONTEXT_TRACKING
+        help
+          Select this option to enable task and CPU time accounting on full
+          dynticks systems. This accounting is implemented by watching every
+          kernel-user boundaries using the context tracking subsystem.
+          The accounting is thus performed at the expense of some significant
+          overhead.
+
+          For now this is only useful if you are working on the full
+          dynticks subsystem development.
+
+          If unsure, say N.
+
 config IRQ_TIME_ACCOUNTING
         bool "Fine granularity task level IRQ time accounting"
         depends on HAVE_IRQ_TIME_ACCOUNTING
@@ -453,7 +470,7 @@ config TREE_RCU
 
 config TREE_PREEMPT_RCU
         bool "Preemptible tree-based hierarchical RCU"
-        depends on PREEMPT && SMP
+        depends on PREEMPT
         help
           This option selects the RCU implementation that is
           designed for very large SMP systems with hundreds or
@@ -461,6 +478,8 @@ config TREE_PREEMPT_RCU
           is also required.  It also scales down nicely to
           smaller systems.
 
+          Select this option if you are unsure.
+
 config TINY_RCU
         bool "UP-only small-memory-footprint RCU"
         depends on !PREEMPT && !SMP
@@ -486,6 +505,14 @@ config PREEMPT_RCU
           This option enables preemptible-RCU code that is common between
           the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.
 
+config RCU_STALL_COMMON
+        def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )
+        help
+          This option enables RCU CPU stall code that is common between
+          the TINY and TREE variants of RCU.  The purpose is to allow
+          the tiny variants to disable RCU CPU stall warnings, while
+          making these warnings mandatory for the tree variants.
+
 config CONTEXT_TRACKING
        bool
 
@@ -1182,7 +1209,7 @@ config CC_OPTIMIZE_FOR_SIZE
           Enabling this option will pass "-Os" instead of "-O2" to gcc
           resulting in a smaller kernel.
 
-          If unsure, say Y.
+          If unsure, say N.
 
 config SYSCTL
         bool
@@ -1263,6 +1290,7 @@ config HOTPLUG
 config PRINTK
         default y
         bool "Enable support for printk" if EXPERT
+        select IRQ_WORK
         help
           This option enables normal printk support. Removing it
           eliminates most of the message strings from the kernel image
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 5e4ded51788e..a32ec1ce882b 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -36,6 +36,10 @@ __setup("noinitrd", no_initrd);
 static int init_linuxrc(struct subprocess_info *info, struct cred *new)
 {
         sys_unshare(CLONE_FS | CLONE_FILES);
+        /* stdin/stdout/stderr for /linuxrc */
+        sys_open("/dev/console", O_RDWR, 0);
+        sys_dup(0);
+        sys_dup(0);
         /* move initrd over / and chdir/chroot in initrd root */
         sys_chdir("/root");
         sys_mount(".", "/", NULL, MS_MOVE, NULL);
@@ -57,6 +61,9 @@ static void __init handle_initrd(void)
         sys_mkdir("/old", 0700);
         sys_chdir("/old");
 
+        /* try loading default modules from initrd */
+        load_default_modules();
+
         /*
          * In case that a resume from disk is carried out by linuxrc or one of
          * its children, we need to tell the freezer not to wait for us.
diff --git a/init/init_task.c b/init/init_task.c
index 8b2f3996b035..ba0a7f362d9e 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -2,6 +2,8 @@
 #include <linux/export.h>
 #include <linux/mqueue.h>
 #include <linux/sched.h>
+#include <linux/sched/sysctl.h>
+#include <linux/sched/rt.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
diff --git a/init/initramfs.c b/init/initramfs.c
index 84c6bf111300..a67ef9dbda9d 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -592,7 +592,7 @@ static int __init populate_rootfs(void)
                         initrd_end - initrd_start);
                 if (!err) {
                         free_initrd();
-                        return 0;
+                        goto done;
                 } else {
                         clean_rootfs();
                         unpack_to_rootfs(__initramfs_start, __initramfs_size);
@@ -607,6 +607,7 @@ static int __init populate_rootfs(void)
                         sys_close(fd);
                         free_initrd();
                 }
+        done:
 #else
                 printk(KERN_INFO "Unpacking initramfs...\n");
                 err = unpack_to_rootfs((char *)initrd_start,
@@ -615,6 +616,11 @@ static int __init populate_rootfs(void)
                         printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
                 free_initrd();
 #endif
+                /*
+                 * Try loading default modules from initramfs.  This gives
+                 * us a chance to load before device_initcalls.
+                 */
+                load_default_modules();
         }
         return 0;
 }
diff --git a/init/main.c b/init/main.c
index 85d69dffe864..63534a141b4e 100644
--- a/init/main.c
+++ b/init/main.c
@@ -70,6 +70,8 @@
 #include <linux/perf_event.h>
 #include <linux/file.h>
 #include <linux/ptrace.h>
+#include <linux/blkdev.h>
+#include <linux/elevator.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -604,7 +606,7 @@ asmlinkage void __init start_kernel(void)
         pidmap_init();
         anon_vma_init();
 #ifdef CONFIG_X86
-        if (efi_enabled)
+        if (efi_enabled(EFI_RUNTIME_SERVICES))
                 efi_enter_virtual_mode();
 #endif
         thread_info_cache_init();
@@ -632,7 +634,7 @@ asmlinkage void __init start_kernel(void)
         acpi_early_init(); /* before LAPIC and SMP init */
         sfi_init_late();
 
-        if (efi_enabled) {
+        if (efi_enabled(EFI_RUNTIME_SERVICES)) {
                 efi_late_init();
                 efi_free_boot_services();
         }
@@ -794,6 +796,17 @@ static void __init do_pre_smp_initcalls(void)
                 do_one_initcall(*fn);
 }
 
+/*
+ * This function requests modules which should be loaded by default and is
+ * called twice right after initrd is mounted and right before init is
+ * exec'd.  If such modules are on either initrd or rootfs, they will be
+ * loaded before control is passed to userland.
+ */
+void __init load_default_modules(void)
+{
+        load_default_elevator_module();
+}
+
 static int run_init_process(const char *init_filename)
 {
         argv_init[0] = init_filename;
@@ -802,7 +815,7 @@ static int run_init_process(const char *init_filename)
                 (const char __user *const __user *)envp_init);
 }
 
-static void __init kernel_init_freeable(void);
+static noinline void __init kernel_init_freeable(void);
 
 static int __ref kernel_init(void *unused)
 {
@@ -845,7 +858,7 @@ static int __ref kernel_init(void *unused)
               "See Linux Documentation/init.txt for guidance.");
 }
 
-static void __init kernel_init_freeable(void)
+static noinline void __init kernel_init_freeable(void)
 {
         /*
          * Wait until kthreadd is all set-up.
@@ -900,4 +913,7 @@ static void __init kernel_init_freeable(void)
          * we're essentially up and running. Get rid of the
          * initmem segments and start the user-mode stuff..
          */
+
+        /* rootfs is available now, try loading default modules */
+        load_default_modules();
 }