Merge branch 'fix/asoc' into for-linus

5 files changed, 100 insertions, 27 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 43298f9810fb..3f42cd66f0f8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -355,7 +355,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH)
+        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || ARM)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -372,6 +372,20 @@ config AUDIT_TREE
         depends on AUDITSYSCALL
         select FSNOTIFY
 
+config AUDIT_LOGINUID_IMMUTABLE
+        bool "Make audit loginuid immutable"
+        depends on AUDIT
+        help
+          The config option toggles if a task setting its loginuid requires
+          CAP_SYS_AUDITCONTROL or if that task should require no special permissions
+          but should instead only allow setting its loginuid if it was never
+          previously set.  On systems which use systemd or a similar central
+          process to restart login services this should be set to true.  On older
+          systems in which an admin would typically have to directly stop and
+          start processes this should be set to false.  Setting this to true allows
+          one to drop potentially dangerous capabilites from the login tasks,
+          but may not be backwards compatible with older init systems.
+
 source "kernel/irq/Kconfig"
 
 menu "RCU Subsystem"
@@ -469,14 +483,14 @@ config RCU_FANOUT_EXACT
 
 config RCU_FAST_NO_HZ
         bool "Accelerate last non-dyntick-idle CPU's grace periods"
-        depends on TREE_RCU && NO_HZ && SMP
+        depends on NO_HZ && SMP
         default n
         help
           This option causes RCU to attempt to accelerate grace periods
-          in order to allow the final CPU to enter dynticks-idle state
-          more quickly.  On the other hand, this option increases the
-          overhead of the dynticks-idle checking, particularly on systems
-          with large numbers of CPUs.
+          in order to allow CPUs to enter dynticks-idle state more
+          quickly.  On the other hand, this option increases the overhead
+          of the dynticks-idle checking, particularly on systems with
+          large numbers of CPUs.
 
           Say Y if energy efficiency is critically important, particularly
                 if you have relatively few CPUs.
@@ -689,6 +703,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
           For those who want to have the feature enabled by default should
           select this option (if, for some reason, they need to disable it
           then swapaccount=0 does the trick).
+config CGROUP_MEM_RES_CTLR_KMEM
+        bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
+        depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
+        default n
+        help
+          The Kernel Memory extension for Memory Resource Controller can limit
+          the amount of memory used by kernel objects in the system. Those are
+          fundamentally different from the entities handled by the standard
+          Memory Controller, which are page-based, and can be swapped. Users of
+          the kmem extension can use it to guarantee that no group of processes
+          will ever exhaust kernel resources alone.
 
 config CGROUP_PERF
         bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
@@ -702,7 +727,6 @@ config CGROUP_PERF
 
 menuconfig CGROUP_SCHED
         bool "Group CPU scheduler"
-        depends on EXPERIMENTAL
         default n
         help
           This feature lets CPU scheduler recognize task groups and control CPU
@@ -773,6 +797,17 @@ config DEBUG_BLK_CGROUP
 
 endif # CGROUPS
 
+config CHECKPOINT_RESTORE
+        bool "Checkpoint/restore support" if EXPERT
+        default n
+        help
+          Enables additional kernel features in a sake of checkpoint/restore.
+          In particular it adds auxiliary prctl codes to setup process text,
+          data and heap segment sizes, and a few additional /proc filesystem
+          entries.
+
+          If unsure, say N here.
+
 menuconfig NAMESPACES
         bool "Namespaces support" if EXPERT
         default !EXPERT
diff --git a/init/calibrate.c b/init/calibrate.c
index 24df7976816c..5f117ca9e069 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -246,6 +246,19 @@ recalibrate:
 
 static DEFINE_PER_CPU(unsigned long, cpu_loops_per_jiffy) = { 0 };
 
+/*
+ * Check if cpu calibration delay is already known. For example,
+ * some processors with multi-core sockets may have all cores
+ * with the same calibration delay.
+ *
+ * Architectures should override this function if a faster calibration
+ * method is available.
+ */
+unsigned long __attribute__((weak)) __cpuinit calibrate_delay_is_known(void)
+{
+        return 0;
+}
+
 void __cpuinit calibrate_delay(void)
 {
         unsigned long lpj;
@@ -265,6 +278,8 @@ void __cpuinit calibrate_delay(void)
                 lpj = lpj_fine;
                 pr_info("Calibrating delay loop (skipped), "
                         "value calculated using timer frequency.. ");
+        } else if ((lpj = calibrate_delay_is_known())) {
+                ;
         } else if ((lpj = calibrate_delay_direct()) != 0) {
                 if (!printed)
                         pr_info("Calibrating delay using timer "
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 0f6e1d985a3b..2974c8b3b351 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -325,17 +325,19 @@ static void __init get_fs_names(char *page)
 
 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 {
+        struct super_block *s;
         int err = sys_mount(name, "/root", fs, flags, data);
         if (err)
                 return err;
 
         sys_chdir((const char __user __force *)"/root");
-        ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
+        s = current->fs->pwd.dentry->d_sb;
+        ROOT_DEV = s->s_dev;
         printk(KERN_INFO
                "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
-               current->fs->pwd.mnt->mnt_sb->s_type->name,
-               current->fs->pwd.mnt->mnt_sb->s_flags & MS_RDONLY ?
-               " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
+               s->s_type->name,
+               s->s_flags & MS_RDONLY ?  " readonly" : "",
+               MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
         return 0;
 }
 
@@ -398,15 +400,42 @@ out:
 }
  
 #ifdef CONFIG_ROOT_NFS
+
+#define NFSROOT_TIMEOUT_MIN     5
+#define NFSROOT_TIMEOUT_MAX     30
+#define NFSROOT_RETRY_MAX       5
+
 static int __init mount_nfs_root(void)
 {
         char *root_dev, *root_data;
+        unsigned int timeout;
+        int try, err;
 
-        if (nfs_root_data(&root_dev, &root_data) != 0)
-                return 0;
-        if (do_mount_root(root_dev, "nfs", root_mountflags, root_data) != 0)
+        err = nfs_root_data(&root_dev, &root_data);
+        if (err != 0)
                 return 0;
-        return 1;
+
+        /*
+         * The server or network may not be ready, so try several
+         * times.  Stop after a few tries in case the client wants
+         * to fall back to other boot methods.
+         */
+        timeout = NFSROOT_TIMEOUT_MIN;
+        for (try = 1; ; try++) {
+                err = do_mount_root(root_dev, "nfs",
+                                        root_mountflags, root_data);
+                if (err == 0)
+                        return 1;
+                if (try > NFSROOT_RETRY_MAX)
+                        break;
+
+                /* Wait, in case the server refused us immediately */
+                ssleep(timeout);
+                timeout <<= 1;
+                if (timeout > NFSROOT_TIMEOUT_MAX)
+                        timeout = NFSROOT_TIMEOUT_MAX;
+        }
+        return 0;
 }
 #endif
 
diff --git a/init/initramfs.c b/init/initramfs.c
index 2531811d42cb..8216c303b082 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -22,7 +22,7 @@ static void __init error(char *x)
 
 static __initdata struct hash {
         int ino, minor, major;
-        mode_t mode;
+        umode_t mode;
         struct hash *next;
         char name[N_ALIGN(PATH_MAX)];
 } *head[32];
@@ -35,7 +35,7 @@ static inline int hash(int major, int minor, int ino)
 }
 
 static char __init *find_link(int major, int minor, int ino,
-                              mode_t mode, char *name)
+                              umode_t mode, char *name)
 {
         struct hash **p, *q;
         for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) {
@@ -120,7 +120,7 @@ static __initdata time_t mtime;
 /* cpio header parsing */
 
 static __initdata unsigned long ino, major, minor, nlink;
-static __initdata mode_t mode;
+static __initdata umode_t mode;
 static __initdata unsigned long body_len, name_len;
 static __initdata uid_t uid;
 static __initdata gid_t gid;
@@ -276,7 +276,7 @@ static int __init maybe_link(void)
         return 0;
 }
 
-static void __init clean_path(char *path, mode_t mode)
+static void __init clean_path(char *path, umode_t mode)
 {
         struct stat st;
 
diff --git a/init/main.c b/init/main.c
index 217ed23e9487..ff49a6dacfbb 100644
--- a/init/main.c
+++ b/init/main.c
@@ -282,10 +282,6 @@ static int __init unknown_bootoption(char *param, char *val)
         return 0;
 }
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
-int __read_mostly debug_pagealloc_enabled = 0;
-#endif
-
 static int __init init_setup(char *str)
 {
         unsigned int i;
@@ -469,13 +465,12 @@ asmlinkage void __init start_kernel(void)
         char * command_line;
         extern const struct kernel_param __start___param[], __stop___param[];
 
-        smp_setup_processor_id();
-
         /*
          * Need to run as early as possible, to initialize the
          * lockdep hash:
          */
         lockdep_init();
+        smp_setup_processor_id();
         debug_objects_early_init();
 
         /*
@@ -597,7 +592,6 @@ asmlinkage void __init start_kernel(void)
         }
 #endif
         page_cgroup_init();
-        enable_debug_pagealloc();
         debug_objects_mem_init();
         kmemleak_init();
         setup_per_cpu_pageset();
@@ -654,7 +648,7 @@ static void __init do_ctors(void)
 #endif
 }
 
-int initcall_debug;
+bool initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
 
 static char msgbuf[64];