5 files changed, 48 insertions, 33 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d10a994c40f5..765018c24cf9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -273,6 +273,16 @@ config FHANDLE
           get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
           syscalls.
 
+config USELIB
+        bool "uselib syscall"
+        default y
+        help
+          This option enables the uselib syscall, a system call used in the
+          dynamic linker from libc5 and earlier.  glibc does not use this
+          system call.  If you intend to run programs built on libc5 or
+          earlier, you may need to enable this syscall.  Current systems
+          running glibc can safely disable this.
+
 config AUDIT
         bool "Auditing support"
         depends on NET
@@ -535,7 +545,7 @@ config CONTEXT_TRACKING_FORCE
           dynticks subsystem by forcing the context tracking on all
           CPUs in the system.
 
-          Say Y only if you're working on the developpement of an
+          Say Y only if you're working on the development of an
           architecture backend for the context tracking.
 
           Say N otherwise, this option brings an overhead that you
@@ -857,7 +867,7 @@ config NUMA_BALANCING
 
 menuconfig CGROUPS
         boolean "Control Group support"
-        depends on EVENTFD
+        select KERNFS
         help
           This option adds support for grouping sets of processes together, for
           use with process control subsystems such as Cpusets, CFS, memory
@@ -924,6 +934,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)
@@ -1119,8 +1130,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
@@ -1152,18 +1161,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
@@ -1305,6 +1304,16 @@ config UID16
         help
           This enables the legacy 16-bit UID syscall wrappers.
 
+config SYSFS_SYSCALL
+        bool "Sysfs syscall support" if EXPERT
+        default y
+        ---help---
+          sys_sysfs is an obsolete system call no longer supported in libc.
+          Note that disabling this option is more secure but might break
+          compatibility with some systems.
+
+          If unsure say Y here.
+
 config SYSCTL_SYSCALL
         bool "Sysctl syscall support" if EXPERT
         depends on PROC_SYSCTL
@@ -1402,6 +1411,13 @@ config FUTEX
           support for "fast userspace mutexes".  The resulting kernel may not
           run glibc-based applications correctly.
 
+config HAVE_FUTEX_CMPXCHG
+        bool
+        help
+          Architectures should select this if futex_atomic_cmpxchg_inatomic()
+          is implemented and always working. This removes a couple of runtime
+          checks.
+
 config EPOLL
         bool "Enable eventpoll support" if EXPERT
         default y
@@ -1470,6 +1486,7 @@ config PCI_QUIRKS
 
 config EMBEDDED
         bool "Embedded system"
+        option allnoconfig_y
         select EXPERT
         help
           This option should be enabled if compiling the kernel for
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 8e5addc45874..82f22885c87e 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -102,13 +102,13 @@ no_match:
 
 /**
  * devt_from_partuuid - looks up the dev_t of a partition by its UUID
- * @uuid:       char array containing ascii UUID
+ * @uuid_str:   char array containing ascii UUID
  *
  * The function will return the first partition which contains a matching
  * UUID value in its partition_meta_info struct.  This does not search
  * by filesystem UUIDs.
  *
- * If @uuid is followed by a "/PARTNROFF=%d", then the number will be
+ * If @uuid_str is followed by a "/PARTNROFF=%d", then the number will be
  * extracted and used as an offset from the partition identified by the UUID.
  *
  * Returns the matching dev_t on success or 0 on failure.
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..a8497fab1c3d 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -455,6 +455,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
                 }
                 this_header = 0;
                 decompress = decompress_method(buf, len, &compress_name);
+                pr_debug("Detected %s compressed data\n", compress_name);
                 if (decompress) {
                         res = decompress(buf, len, NULL, flush_buffer, NULL,
                                    &my_inptr, error);
@@ -583,7 +584,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..9c7fd4c9249f 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();
 }
 
@@ -584,7 +580,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();
 
@@ -615,6 +612,7 @@ asmlinkage void __init start_kernel(void)
         calibrate_delay();
         pidmap_init();
         anon_vma_init();
+        acpi_early_init();
 #ifdef CONFIG_X86
         if (efi_enabled(EFI_RUNTIME_SERVICES))
                 efi_enter_virtual_mode();
@@ -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)) {
@@ -815,7 +812,7 @@ void __init load_default_modules(void)
 static int run_init_process(const char *init_filename)
 {
         argv_init[0] = init_filename;
-        return do_execve(init_filename,
+        return do_execve(getname_kernel(init_filename),
                 (const char __user *const __user *)argv_init,
                 (const char __user *const __user *)envp_init);
 }