Forward to 2.6.33-rc8

Merge branch 'linus' into rt/head with a pile of conflicts.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

7 files changed, 183 insertions, 162 deletions

diff --git a/init/Kconfig b/init/Kconfig
index ef7c8dbb2127..5cc04424f552 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2
 config HAVE_KERNEL_LZMA
         bool
 
+config HAVE_KERNEL_LZO
+        bool
+
 choice
         prompt "Kernel compression mode"
         default KERNEL_GZIP
-        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
+        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
         help
           The linux kernel is a kind of self-extracting executable.
           Several compression algorithms are available, which differ
@@ -141,9 +144,8 @@ config KERNEL_GZIP
         bool "Gzip"
         depends on HAVE_KERNEL_GZIP
         help
-          The old and tried gzip compression. Its compression ratio is
-          the poorest among the 3 choices; however its speed (both
-          compression and decompression) is the fastest.
+          The old and tried gzip compression. It provides a good balance
+          between compression ratio and decompression speed.
 
 config KERNEL_BZIP2
         bool "Bzip2"
@@ -164,6 +166,14 @@ config KERNEL_LZMA
           two. Compression is slowest.  The kernel size is about 33%
           smaller with LZMA in comparison to gzip.
 
+config KERNEL_LZO
+        bool "LZO"
+        depends on HAVE_KERNEL_LZO
+        help
+          Its compression ratio is the poorest among the 4. The kernel
+          size is about about 10% bigger than gzip; however its speed
+          (both compression and decompression) is the fastest.
+
 endchoice
 
 config SWAP
@@ -297,7 +307,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)
+        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -316,40 +326,39 @@ choice
         prompt "RCU Implementation"
         default TREE_RCU
 
-config CLASSIC_RCU
-        bool "Classic RCU"
-        depends on !PREEMPT_RT
-        help
-          This option selects the classic RCU implementation that is
-          designed for best read-side performance on non-realtime
-          systems.
-
-          Select this option if you are unsure.
-
 config TREE_RCU
         bool "Tree-based hierarchical RCU"
         depends on !PREEMPT_RT
         help
           This option selects the RCU implementation that is
           designed for very large SMP system with hundreds or
-          thousands of CPUs.
+          thousands of CPUs.  It also scales down nicely to
+          smaller systems.
 
-config PREEMPT_RCU
-        bool "Preemptible RCU"
+config TREE_PREEMPT_RCU
+        bool "Preemptable tree-based hierarchical RCU"
         depends on PREEMPT
         help
-          This option reduces the latency of the kernel by making certain
-          RCU sections preemptible. Normally RCU code is non-preemptible, if
-          this option is selected then read-only RCU sections become
-          preemptible. This helps latency, but may expose bugs due to
-          now-naive assumptions about each RCU read-side critical section
-          remaining on a given CPU through its execution.
+          This option selects the RCU implementation that is
+          designed for very large SMP systems with hundreds or
+          thousands of CPUs, but for which real-time response
+          is also required.  It also scales down nicely to
+          smaller systems.
+
+config TINY_RCU
+        bool "UP-only small-memory-footprint RCU"
+        depends on !SMP && !PREEMPT_RT
+        help
+          This option selects the RCU implementation that is
+          designed for UP systems from which real-time response
+          is not required.  This option greatly reduces the
+          memory footprint of RCU.
 
 endchoice
 
 config RCU_TRACE
         bool "Enable tracing for RCU"
-        depends on TREE_RCU || PREEMPT_RCU
+        depends on TREE_RCU || TREE_PREEMPT_RCU
         help
           This option provides tracing in RCU which presents stats
           in debugfs for debugging RCU implementation.
@@ -361,7 +370,7 @@ config RCU_FANOUT
         int "Tree-based hierarchical RCU fanout value"
         range 2 64 if 64BIT
         range 2 32 if !64BIT
-        depends on TREE_RCU
+        depends on TREE_RCU || TREE_PREEMPT_RCU
         default 64 if 64BIT
         default 32 if !64BIT
         help
@@ -376,7 +385,7 @@ config RCU_FANOUT
 
 config RCU_FANOUT_EXACT
         bool "Disable tree-based hierarchical RCU auto-balancing"
-        depends on TREE_RCU
+        depends on TREE_RCU || TREE_PREEMPT_RCU
         default n
         help
           This option forces use of the exact RCU_FANOUT value specified,
@@ -389,18 +398,12 @@ config RCU_FANOUT_EXACT
           Say N if unsure.
 
 config TREE_RCU_TRACE
-        def_bool RCU_TRACE && TREE_RCU
+        def_bool RCU_TRACE && ( TREE_RCU || TREE_PREEMPT_RCU )
         select DEBUG_FS
         help
-          This option provides tracing for the TREE_RCU implementation,
-          permitting Makefile to trivially select kernel/rcutree_trace.c.
-
-config PREEMPT_RCU_TRACE
-        def_bool RCU_TRACE && PREEMPT_RCU
-        select DEBUG_FS
-        help
-          This option provides tracing for the PREEMPT_RCU implementation,
-          permitting Makefile to trivially select kernel/rcupreempt_trace.c.
+          This option provides tracing for the TREE_RCU and
+          TREE_PREEMPT_RCU implementations, permitting Makefile to
+          trivially select kernel/rcutree_trace.c.
 
 endmenu # "RCU Subsystem"
 
@@ -623,7 +626,7 @@ config SYSFS_DEPRECATED
         bool
 
 config SYSFS_DEPRECATED_V2
-        bool "remove sysfs features which may confuse old userspace tools"
+        bool "enable deprecated sysfs features to support old userspace tools"
         depends on SYSFS
         default n
         select SYSFS_DEPRECATED
@@ -771,6 +774,7 @@ config UID16
 
 config SYSCTL_SYSCALL
         bool "Sysctl syscall support" if EMBEDDED
+        depends on PROC_SYSCTL
         default y
         select SYSCTL
         ---help---
@@ -933,31 +937,41 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
-config HAVE_PERF_COUNTERS
+config HAVE_PERF_EVENTS
         bool
         help
           See tools/perf/design.txt for details.
 
-menu "Performance Counters"
+config PERF_USE_VMALLOC
+        bool
+        help
+          See tools/perf/design.txt for details
 
-config PERF_COUNTERS
-        bool "Kernel Performance Counters"
-        default y if PROFILING
-        depends on HAVE_PERF_COUNTERS
+menu "Kernel Performance Events And Counters"
+
+config PERF_EVENTS
+        bool "Kernel performance events and counters"
+        default y if (PROFILING || PERF_COUNTERS)
+        depends on HAVE_PERF_EVENTS
         select ANON_INODES
         help
-          Enable kernel support for performance counter hardware.
+          Enable kernel support for various performance events provided
+          by software and hardware.
+
+          Software events are supported either built-in or via the
+          use of generic tracepoints.
 
-          Performance counters are special hardware registers available
-          on most modern CPUs. These registers count the number of certain
+          Most modern CPUs support performance events via performance
+          counter registers. These registers count the number of certain
           types of hw events: such as instructions executed, cachemisses
           suffered, or branches mis-predicted - without slowing down the
           kernel or applications. These registers can also trigger interrupts
           when a threshold number of events have passed - and can thus be
           used to profile the code that runs on that CPU.
 
-          The Linux Performance Counter subsystem provides an abstraction of
-          these hardware capabilities, available via a system call. It
+          The Linux Performance Event subsystem provides an abstraction of
+          these software and hardware event capabilities, available via a
+          system call and used by the "perf" utility in tools/perf/. It
           provides per task and per CPU counters, and it provides event
           capabilities on top of those.
 
@@ -965,17 +979,42 @@ config PERF_COUNTERS
 
 config EVENT_PROFILE
         bool "Tracepoint profiling sources"
-        depends on PERF_COUNTERS && EVENT_TRACING
+        depends on PERF_EVENTS && EVENT_TRACING
         default y
         help
-         Allow the use of tracepoints as software performance counters.
+         Allow the use of tracepoints as software performance events.
 
-         When this is enabled, you can create perf counters based on
+         When this is enabled, you can create perf events based on
          tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
          found in debugfs://tracing/events/*/*/id. (The -e/--events
          option to the perf tool can parse and interpret symbolic
          tracepoints, in the subsystem:tracepoint_name format.)
 
+config PERF_COUNTERS
+        bool "Kernel performance counters (old config option)"
+        depends on HAVE_PERF_EVENTS
+        help
+          This config has been obsoleted by the PERF_EVENTS
+          config option - please see that one for details.
+
+          It has no effect on the kernel whether you enable
+          it or not, it is a compatibility placeholder.
+
+          Say N if unsure.
+
+config DEBUG_PERF_USE_VMALLOC
+        default n
+        bool "Debug: use vmalloc to back perf mmap() buffers"
+        depends on PERF_EVENTS && DEBUG_KERNEL
+        select PERF_USE_VMALLOC
+        help
+         Use vmalloc memory to back perf mmap() buffers.
+
+         Mostly useful for debugging the vmalloc code on platforms
+         that don't require it.
+
+         Say N if unsure.
+
 endmenu
 
 config VM_EVENT_COUNTERS
@@ -1006,14 +1045,6 @@ config SLUB_DEBUG
           SLUB sysfs support. /sys/slab will not exist and there will be
           no support for cache validation etc.
 
-config STRIP_ASM_SYMS
-        bool "Strip assembler-generated symbols during link"
-        default n
-        help
-          Strip internal assembler-generated symbols during a link (symbols
-          that look like '.Lxxx') so they don't pollute the output of
-          get_wchan() and suchlike.
-
 config COMPAT_BRK
         bool "Disable heap randomization"
         default y
@@ -1060,6 +1091,28 @@ config SLOB
 
 endchoice
 
+config MMAP_ALLOW_UNINITIALIZED
+        bool "Allow mmapped anonymous memory to be uninitialized"
+        depends on EMBEDDED && !MMU
+        default n
+        help
+          Normally, and according to the Linux spec, anonymous memory obtained
+          from mmap() has it's contents cleared before it is passed to
+          userspace.  Enabling this config option allows you to request that
+          mmap() skip that if it is given an MAP_UNINITIALIZED flag, thus
+          providing a huge performance boost.  If this option is not enabled,
+          then the flag will be ignored.
+
+          This is taken advantage of by uClibc's malloc(), and also by
+          ELF-FDPIC binfmt's brk and stack allocator.
+
+          Because of the obvious security issues, this option should only be
+          enabled on embedded devices where you control what is run in
+          userspace.  Since that isn't generally a problem on no-MMU systems,
+          it is normally safe to say Y here.
+
+          See Documentation/nommu-mmap.txt for more information.
+
 config PROFILING
         bool "Profiling support (EXPERIMENTAL)"
         help
@@ -1073,14 +1126,6 @@ config PROFILING
 config TRACEPOINTS
         bool
 
-config MARKERS
-        bool "Activate markers"
-        depends on !PREEMPT_RT
-        select TRACEPOINTS
-        help
-          Place an empty function call at each marker site. Can be
-          dynamically changed for a probe function.
-
 source "arch/Kconfig"
 
 config SLOW_WORK
@@ -1097,6 +1142,16 @@ config SLOW_WORK
 
           See Documentation/slow-work.txt.
 
+config SLOW_WORK_DEBUG
+        bool "Slow work debugging through debugfs"
+        default n
+        depends on SLOW_WORK && DEBUG_FS
+        help
+          Display the contents of the slow work run queue through debugfs,
+          including items currently executing.
+
+          See Documentation/slow-work.txt.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
@@ -1209,3 +1264,4 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
         bool
 
+source "kernel/Kconfig.locks"
diff --git a/init/Makefile b/init/Makefile
index 3f6e894183d0..dc276e46e964 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,12 +15,8 @@ mounts-$(CONFIG_BLK_DEV_RAM)	+= do_mounts_rd.o
 mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
 mounts-$(CONFIG_BLK_DEV_MD)     += do_mounts_md.o
 
-# files to be removed upon make clean
-clean-files := ../include/linux/compile.h
-
 # dependencies on generated files need to be listed explicitly
-
-$(obj)/version.o: include/linux/compile.h
+$(obj)/version.o: include/generated/compile.h
 
 # compile.h changes depending on hostname, generation number, etc,
 # so we regenerate it always.
@@ -30,7 +26,7 @@ $(obj)/version.o: include/linux/compile.h
        chk_compile.h = :
  quiet_chk_compile.h = echo '  CHK     $@'
 silent_chk_compile.h = :
-include/linux/compile.h: FORCE
+include/generated/compile.h: FORCE
         @$($(quiet)chk_compile.h)
         $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
         "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT)" \
diff --git a/init/calibrate.c b/init/calibrate.c
index a379c9061199..6eb48e53d61c 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -123,23 +123,26 @@ void __cpuinit calibrate_delay(void)
 {
         unsigned long ticks, loopbit;
         int lps_precision = LPS_PREC;
+        static bool printed;
 
         if (preset_lpj) {
                 loops_per_jiffy = preset_lpj;
-                printk(KERN_INFO
-                        "Calibrating delay loop (skipped) preset value.. ");
-        } else if ((smp_processor_id() == 0) && lpj_fine) {
+                if (!printed)
+                        pr_info("Calibrating delay loop (skipped) "
+                                "preset value.. ");
+        } else if ((!printed) && lpj_fine) {
                 loops_per_jiffy = lpj_fine;
-                printk(KERN_INFO
-                        "Calibrating delay loop (skipped), "
+                pr_info("Calibrating delay loop (skipped), "
                         "value calculated using timer frequency.. ");
         } else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) {
-                printk(KERN_INFO
-                        "Calibrating delay using timer specific routine.. ");
+                if (!printed)
+                        pr_info("Calibrating delay using timer "
+                                "specific routine.. ");
         } else {
                 loops_per_jiffy = (1<<12);
 
-                printk(KERN_INFO "Calibrating delay loop... ");
+                if (!printed)
+                        pr_info("Calibrating delay loop... ");
                 while ((loops_per_jiffy <<= 1) != 0) {
                         /* wait for "start of" clock tick */
                         ticks = jiffies;
@@ -170,7 +173,10 @@ void __cpuinit calibrate_delay(void)
                                 loops_per_jiffy &= ~loopbit;
                 }
         }
-        printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n",
+        if (!printed)
+                pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
                         loops_per_jiffy/(500000/HZ),
                         (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
+
+        printed = true;
 }
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 093f65915501..bb008d064c1a 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -415,7 +415,7 @@ void __init prepare_namespace(void)
 
         mount_root();
 out:
+        devtmpfs_mount("dev");
         sys_mount(".", "/", NULL, MS_MOVE, NULL);
         sys_chroot(".");
 }
-
diff --git a/init/initramfs.c b/init/initramfs.c
index 4c00edc59689..b37d34beb90b 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -413,7 +413,7 @@ static unsigned my_inptr;   /* index of next byte to be processed in inbuf */
 
 static char * __init unpack_to_rootfs(char *buf, unsigned len)
 {
-        int written;
+        int written, res;
         decompress_fn decompress;
         const char *compress_name;
         static __initdata char msg_buf[64];
@@ -445,10 +445,12 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
                 }
                 this_header = 0;
                 decompress = decompress_method(buf, len, &compress_name);
-                if (decompress)
-                        decompress(buf, len, NULL, flush_buffer, NULL,
+                if (decompress) {
+                        res = decompress(buf, len, NULL, flush_buffer, NULL,
                                    &my_inptr, error);
-                else if (compress_name) {
+                        if (res)
+                                error("decompressor failed");
+                } else if (compress_name) {
                         if (!message) {
                                 snprintf(msg_buf, sizeof msg_buf,
                                          "compression method %s not configured",
diff --git a/init/main.c b/init/main.c
index ff438b198fe3..aa48b7bec262 100644
--- a/init/main.c
+++ b/init/main.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
-#include <linux/utsname.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
@@ -69,6 +68,8 @@
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
+#include <linux/sfi.h>
+#include <linux/shmem_fs.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -251,7 +252,7 @@ early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
- * failed parameters
+ * unused parameters (modprobe will find them in /proc/cmdline).
  */
 static int __init unknown_bootoption(char *param, char *val)
 {
@@ -272,14 +273,9 @@ static int __init unknown_bootoption(char *param, char *val)
         if (obsolete_checksetup(param))
                 return 0;
 
-        /*
-         * Preemptive maintenance for "why didn't my misspelled command
-         * line work?"
-         */
-        if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
-                printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);
+        /* Unused module parameter. */
+        if (strchr(param, '.') && (!val || strchr(param, '.') < val))
                 return 0;
-        }
 
         if (panic_later)
                 return 0;
@@ -354,17 +350,11 @@ static void __init smp_init(void)
 #define smp_init()      do { } while (0)
 #endif
 
-static inline void setup_per_cpu_areas(void) { }
 static inline void setup_nr_cpu_ids(void) { }
 static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 
 #else
 
-#if NR_CPUS > BITS_PER_LONG
-cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL;
-EXPORT_SYMBOL(cpu_mask_all);
-#endif
-
 /* Setup number of possible processor ids */
 int nr_cpu_ids __read_mostly = NR_CPUS;
 EXPORT_SYMBOL(nr_cpu_ids);
@@ -375,40 +365,11 @@ static void __init setup_nr_cpu_ids(void)
         nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
 }
 
-#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
-
-EXPORT_SYMBOL(__per_cpu_offset);
-
-static void __init setup_per_cpu_areas(void)
-{
-        unsigned long size, i;
-        char *ptr;
-        unsigned long nr_possible_cpus = num_possible_cpus();
-
-        /* Copy section for each CPU (we discard the original) */
-        size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
-        ptr = alloc_bootmem_pages(size * nr_possible_cpus);
-
-        for_each_possible_cpu(i) {
-                __per_cpu_offset[i] = ptr - __per_cpu_start;
-                memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
-                ptr += size;
-        }
-}
-#endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
-
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)
 {
         unsigned int cpu;
 
-        /*
-         * Set up the current CPU as possible to migrate to.
-         * The other ones will be done by cpu_up/cpu_down()
-         */
-        set_cpu_active(smp_processor_id(), true);
-
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
                 if (num_online_cpus() >= setup_max_cpus)
@@ -454,6 +415,7 @@ static noinline void __init_refok rest_init(void)
 
         system_state = SYSTEM_BOOTING_SCHEDULER_OK;
 
+        rcu_scheduler_starting();
         kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
         pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES);
@@ -465,7 +427,6 @@ static noinline void __init_refok rest_init(void)
          * at least once to get things moving:
          */
         init_idle_bootup_task(current);
-        rcu_scheduler_starting();
         preempt_enable_and_schedule();
         preempt_disable();
 
@@ -521,6 +482,7 @@ static void __init boot_cpu_init(void)
         int cpu = smp_processor_id();
         /* Mark the boot cpu "present", "online" etc for SMP and UP case */
         set_cpu_online(cpu, true);
+        set_cpu_active(cpu, true);
         set_cpu_present(cpu, true);
         set_cpu_possible(cpu, true);
 }
@@ -633,7 +595,6 @@ asmlinkage void __init start_kernel(void)
         softirq_init();
         timekeeping_init();
         time_init();
-        sched_clock_init();
         profile_init();
         if (!irqs_disabled())
                 printk(KERN_CRIT "start_kernel(): bug: interrupts were "
@@ -662,7 +623,16 @@ asmlinkage void __init start_kernel(void)
          * to self-test [hard/soft]-irqs on/off lock inversion bugs
          * too:
          */
-        locking_selftest();
+        if (1) {
+                /*
+                 * Hack around the fact that locking_selftest() destroys
+                 * the lockdep state, so release the one known lock and
+                 * acquire it again after the self-test is done.
+                 */
+                mutex_release(&kernel_sem.dep_map, 1, _THIS_IP_);
+                locking_selftest();
+                mutex_acquire(&kernel_sem.dep_map, 0, 0, _THIS_IP_);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start && !initrd_below_start_ok &&
@@ -684,6 +654,7 @@ asmlinkage void __init start_kernel(void)
         numa_policy_init();
         if (late_time_init)
                 late_time_init();
+        sched_clock_init();
         calibrate_delay();
         pidmap_init();
         anon_vma_init();
@@ -693,13 +664,13 @@ asmlinkage void __init start_kernel(void)
 #endif
         thread_info_cache_init();
         cred_init();
-        fork_init(num_physpages);
+        fork_init(totalram_pages);
         proc_caches_init();
         buffer_init();
         key_init();
-        security_init();
-        vfs_caches_init(num_physpages);
         radix_tree_init();
+        security_init();
+        vfs_caches_init(totalram_pages);
         signals_init();
         /* rootfs populating might need page-writeback */
         page_writeback_init();
@@ -714,6 +685,7 @@ asmlinkage void __init start_kernel(void)
         check_bugs();
 
         acpi_early_init(); /* before LAPIC and SMP init */
+        sfi_init_late();
 
         ftrace_init();
 
@@ -728,10 +700,10 @@ asmlinkage void __init start_kernel(void)
 static void __init do_ctors(void)
 {
 #ifdef CONFIG_CONSTRUCTORS
-        ctor_fn_t *call = (ctor_fn_t *) __ctors_start;
+        ctor_fn_t *fn = (ctor_fn_t *) __ctors_start;
 
-        for (; call < (ctor_fn_t *) __ctors_end; call++)
-                (*call)();
+        for (; fn < (ctor_fn_t *) __ctors_end; fn++)
+                (*fn)();
 #endif
 }
 
@@ -792,10 +764,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
 
 static void __init do_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
 
-        for (call = __early_initcall_end; call < __initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+                do_one_initcall(*fn);
 
         /* Make sure there is no pending stuff from the initcall sequence */
         flush_scheduled_work();
@@ -810,10 +782,10 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
-        rcu_init_sched(); /* needed by module_init stage. */
         init_workqueues();
         cpuset_init_smp();
         usermodehelper_init();
+        init_tmpfs();
         driver_init();
         init_irq_proc();
         do_ctors();
@@ -822,11 +794,11 @@ static void __init do_basic_setup(void)
 
 static void __init do_pre_smp_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
         extern int spawn_desched_task(void);
 
-        for (call = __initcall_start; call < __early_initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+                do_one_initcall(*fn);
         spawn_desched_task();
 }
 
@@ -936,15 +908,7 @@ static int __init kernel_init(void * unused)
         WARN_ON(irqs_disabled());
 #endif
 
-#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + \
-        defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + \
-        defined(CONFIG_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + \
-        defined(CONFIG_PREEMPT_OFF_HIST) + \
-        defined(CONFIG_WAKEUP_LATENCY_HIST) + \
-        defined(CONFIG_MISSED_TIMER_OFFSETS_HIST) + \
-        defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + \
-        defined(CONFIG_LOCKDEP) + \
-        (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
+#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
 
 #if DEBUG_COUNT > 0
         printk(KERN_ERR "*****************************************************************************\n");
@@ -976,9 +940,6 @@ static int __init kernel_init(void * unused)
 #ifdef CONFIG_WAKEUP_LATENCY_HIST
         printk(KERN_ERR "*        CONFIG_WAKEUP_LATENCY_HIST                                         *\n");
 #endif
-#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-        printk(KERN_ERR "*        CONFIG_MISSED_TIMER_OFFSETS_HIST                                   *\n");
-#endif
 #ifdef CONFIG_DEBUG_SLAB
         printk(KERN_ERR "*        CONFIG_DEBUG_SLAB                                                  *\n");
 #endif
diff --git a/init/version.c b/init/version.c
index 52a8b98642b8..adff586401a5 100644
--- a/init/version.c
+++ b/init/version.c
@@ -6,11 +6,11 @@
  *  May be freely distributed as part of Linux.
  */
 
-#include <linux/compile.h>
+#include <generated/compile.h>
 #include <linux/module.h>
 #include <linux/uts.h>
 #include <linux/utsname.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/version.h>
 
 #ifndef CONFIG_KALLSYMS