Merge branch 'linus' into core/locking

Refresh the topic.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

4 files changed, 15 insertions, 30 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 5236dc562a36..009a797dd242 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -284,7 +284,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
+        depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ALPHA)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -854,7 +854,6 @@ config NUMA_BALANCING
 
 menuconfig CGROUPS
         boolean "Control Group support"
-        depends on EVENTFD
         help
           This option adds support for grouping sets of processes together, for
           use with process control subsystems such as Cpusets, CFS, memory
@@ -921,6 +920,7 @@ config MEMCG
         bool "Memory Resource Controller for Control Groups"
         depends on RESOURCE_COUNTERS
         select MM_OWNER
+        select EVENTFD
         help
           Provides a memory resource controller that manages both anonymous
           memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -1116,8 +1116,6 @@ config IPC_NS
 
 config USER_NS
         bool "User namespace"
-        select UIDGID_STRICT_TYPE_CHECKS
-
         default n
         help
           This allows containers, i.e. vservers, to use user namespaces
@@ -1149,18 +1147,8 @@ config NET_NS
 
 endif # NAMESPACES
 
-config UIDGID_STRICT_TYPE_CHECKS
-        bool "Require conversions between uid/gids and their internal representation"
-        default n
-        help
-         While the nececessary conversions are being added to all subsystems this option allows
-         the code to continue to build for unconverted subsystems.
-
-         Say Y here if you want the strict type checking enabled
-
 config SCHED_AUTOGROUP
         bool "Automatic process group scheduling"
-        select EVENTFD
         select CGROUPS
         select CGROUP_SCHED
         select FAIR_GROUP_SCHED
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 7c098ac9068a..a8227022e3a0 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -13,7 +13,7 @@
 #include <linux/minix_fs.h>
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
-#include <linux/cramfs_fs.h>
+#include <uapi/linux/cramfs_fs.h>
 #include <linux/initrd.h>
 #include <linux/string.h>
 #include <linux/slab.h>
diff --git a/init/initramfs.c b/init/initramfs.c
index a67ef9dbda9d..93b61396756b 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
 {
         char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
         if (err)
-                panic(err);     /* Failed to decompress INTERNAL initramfs */
+                panic("%s", err); /* Failed to decompress INTERNAL initramfs */
         if (initrd_start) {
 #ifdef CONFIG_BLK_DEV_RAM
                 int fd;
diff --git a/init/main.c b/init/main.c
index febc511e078a..2fd9cef70ee8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -92,17 +92,11 @@ static int kernel_init(void *);
 
 extern void init_IRQ(void);
 extern void fork_init(unsigned long);
-extern void mca_init(void);
-extern void sbus_init(void);
 extern void radix_tree_init(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
 #endif
 
-#ifdef CONFIG_TC
-extern void tc_init(void);
-#endif
-
 /*
  * Debug helper: via this flag we know that we are in 'early bootup code'
  * where only the boot processor is running with IRQ disabled.  This means
@@ -282,7 +276,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
                 unsigned int i;
                 for (i = 0; envp_init[i]; i++) {
                         if (i == MAX_INIT_ENVS) {
-                                panic_later = "Too many boot env vars at `%s'";
+                                panic_later = "env";
                                 panic_param = param;
                         }
                         if (!strncmp(param, envp_init[i], val - param))
@@ -294,7 +288,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
                 unsigned int i;
                 for (i = 0; argv_init[i]; i++) {
                         if (i == MAX_INIT_ARGS) {
-                                panic_later = "Too many boot init vars at `%s'";
+                                panic_later = "init";
                                 panic_param = param;
                         }
                 }
@@ -355,9 +349,11 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  */
 static void __init setup_command_line(char *command_line)
 {
-        saved_command_line = alloc_bootmem(strlen (boot_command_line)+1);
-        initcall_command_line = alloc_bootmem(strlen (boot_command_line)+1);
-        static_command_line = alloc_bootmem(strlen (command_line)+1);
+        saved_command_line =
+                memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
+        initcall_command_line =
+                memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
+        static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
         strcpy (saved_command_line, boot_command_line);
         strcpy (static_command_line, command_line);
 }
@@ -476,7 +472,7 @@ static void __init mm_init(void)
         mem_init();
         kmem_cache_init();
         percpu_init_late();
-        pgtable_cache_init();
+        pgtable_init();
         vmalloc_init();
 }
 
@@ -565,6 +561,7 @@ asmlinkage void __init start_kernel(void)
         init_timers();
         hrtimers_init();
         softirq_init();
+        acpi_early_init();
         timekeeping_init();
         time_init();
         sched_clock_postinit();
@@ -584,7 +581,8 @@ asmlinkage void __init start_kernel(void)
          */
         console_init();
         if (panic_later)
-                panic(panic_later, panic_param);
+                panic("Too many boot %s vars at `%s'", panic_later,
+                      panic_param);
 
         lockdep_info();
 
@@ -641,7 +639,6 @@ asmlinkage void __init start_kernel(void)
 
         check_bugs();
 
-        acpi_early_init(); /* before LAPIC and SMP init */
         sfi_init_late();
 
         if (efi_enabled(EFI_RUNTIME_SERVICES)) {