5 files changed, 27 insertions, 11 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 9d8cf2d2f840..09c79537ae09 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -531,7 +531,7 @@ config CGROUP_DEVICE
 
 config CPUSETS
         bool "Cpuset support"
-        depends on SMP && CGROUPS
+        depends on CGROUPS
         help
           This option will let you create and manage CPUSETs which
           allow dynamically partitioning a system into sets of CPUs and
@@ -565,7 +565,7 @@ config CGROUP_MEM_RES_CTLR
         select MM_OWNER
         help
           Provides a memory resource controller that manages both anonymous
-          memory and page cache. (See Documentation/controllers/memory.txt)
+          memory and page cache. (See Documentation/cgroups/memory.txt)
 
           Note that setting this option increases fixed memory overhead
           associated with each page of memory in the system. By this,
@@ -597,6 +597,8 @@ config CGROUP_MEM_RES_CTLR_SWAP
           is disabled by boot option, this will be automatically disabled and
           there will be no overhead from this. Even when you set this config=y,
           if boot option "noswapaccount" is set, swap will not be accounted.
+          Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
+          size is 4096bytes, 512k per 1Gbytes of swap.
 
 endif # CGROUPS
 
@@ -687,7 +689,7 @@ config PID_NS
         depends on NAMESPACES && EXPERIMENTAL
         help
           Support process id namespaces.  This allows having multiple
-          process with the same pid as long as they are in different
+          processes with the same pid as long as they are in different
           pid namespaces.  This is a building block of containers.
 
           Unless you want to work with an experimental feature
@@ -952,7 +954,7 @@ config COMPAT_BRK
           Randomizing heap placement makes heap exploits harder, but it
           also breaks ancient binaries (including anything libc5 based).
           This option changes the bootup default to heap randomization
-          disabled, and can be overriden runtime by setting
+          disabled, and can be overridden at runtime by setting
           /proc/sys/kernel/randomize_va_space to 2.
 
           On non-ancient distros (post-2000 ones) N is usually a safe choice.
@@ -1012,6 +1014,18 @@ config MARKERS
 
 source "arch/Kconfig"
 
+config SLOW_WORK
+        default n
+        bool "Enable slow work thread pool"
+        help
+          The slow work thread pool provides a number of dynamically allocated
+          threads that can be used by the kernel to perform operations that
+          take a relatively long time.
+
+          An example of this would be CacheFiles doing a path lookup followed
+          by a series of mkdirs and a create call, all of which have to touch
+          disk.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
@@ -1110,7 +1124,7 @@ config INIT_ALL_POSSIBLE
           cpu_possible_map, some of them chose to initialize cpu_possible_map
           with all 1s, and others with all 0s.  When they were centralised,
           it was better to provide this option than to break all the archs
-          and have several arch maintainers persuing me down dark alleys.
+          and have several arch maintainers pursuing me down dark alleys.
 
 config STOP_MACHINE
         bool
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 8d4ff5afc1d8..dd7ee5f203f3 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -14,6 +14,7 @@
 #include <linux/fs.h>
 #include <linux/initrd.h>
 #include <linux/async.h>
+#include <linux/fs_struct.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 9aa968d54329..f5b978a9bb92 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 9bdddbcb3d6a..69aebbf8fd2d 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -1,5 +1,6 @@
 #include <linux/delay.h>
-#include <linux/raid/md.h>
+#include <linux/raid/md_u.h>
+#include <linux/raid/md_p.h>
 
 #include "do_mounts.h"
 
@@ -112,8 +113,6 @@ static int __init md_setup(char *str)
         return 1;
 }
 
-#define MdpMinorShift 6
-
 static void __init md_setup_drive(void)
 {
         int minor, i, ent, partitioned;
diff --git a/init/initramfs.c b/init/initramfs.c
index 619c1baf7701..80cd713f6cc5 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -571,11 +571,11 @@ static int __init populate_rootfs(void)
         if (initrd_start) {
 #ifdef CONFIG_BLK_DEV_RAM
                 int fd;
-                printk(KERN_INFO "checking if image is initramfs...");
+                printk(KERN_INFO "checking if image is initramfs...\n");
                 err = unpack_to_rootfs((char *)initrd_start,
                         initrd_end - initrd_start);
                 if (!err) {
-                        printk(" it is\n");
+                        printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");
                         free_initrd();
                         return 0;
                 } else {
@@ -583,7 +583,8 @@ static int __init populate_rootfs(void)
                         unpack_to_rootfs(__initramfs_start,
                                  __initramfs_end - __initramfs_start);
                 }
-                printk("it isn't (%s); looks like an initrd\n", err);
+                printk(KERN_INFO "rootfs image is not initramfs (%s)"
+                                "; looks like an initrd\n", err);
                 fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
                 if (fd >= 0) {
                         sys_write(fd, (char *)initrd_start,