Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2 files changed, 27 insertions, 10 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d07dcf9fc8a9..af6c7f8ba019 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -357,7 +357,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || ARM)
+        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -686,7 +686,7 @@ config RESOURCE_COUNTERS
           This option enables controller independent resource accounting
           infrastructure that works with cgroups.
 
-config CGROUP_MEM_RES_CTLR
+config MEMCG
         bool "Memory Resource Controller for Control Groups"
         depends on RESOURCE_COUNTERS
         select MM_OWNER
@@ -709,9 +709,9 @@ config CGROUP_MEM_RES_CTLR
           This config option also selects MM_OWNER config option, which
           could in turn add some fork/exit overhead.
 
-config CGROUP_MEM_RES_CTLR_SWAP
+config MEMCG_SWAP
         bool "Memory Resource Controller Swap Extension"
-        depends on CGROUP_MEM_RES_CTLR && SWAP
+        depends on MEMCG && SWAP
         help
           Add swap management feature to memory resource controller. When you
           enable this, you can limit mem+swap usage per cgroup. In other words,
@@ -726,9 +726,9 @@ config CGROUP_MEM_RES_CTLR_SWAP
           if boot option "swapaccount=0" 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.
-config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
+config MEMCG_SWAP_ENABLED
         bool "Memory Resource Controller Swap Extension enabled by default"
-        depends on CGROUP_MEM_RES_CTLR_SWAP
+        depends on MEMCG_SWAP
         default y
         help
           Memory Resource Controller Swap Extension comes with its price in
@@ -739,9 +739,9 @@ 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
+config MEMCG_KMEM
         bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
-        depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
+        depends on MEMCG && EXPERIMENTAL
         default n
         help
           The Kernel Memory extension for Memory Resource Controller can limit
@@ -751,6 +751,21 @@ config CGROUP_MEM_RES_CTLR_KMEM
           the kmem extension can use it to guarantee that no group of processes
           will ever exhaust kernel resources alone.
 
+config CGROUP_HUGETLB
+        bool "HugeTLB Resource Controller for Control Groups"
+        depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL
+        default n
+        help
+          Provides a cgroup Resource Controller for HugeTLB pages.
+          When you enable this, you can put a per cgroup limit on HugeTLB usage.
+          The limit is enforced during page fault. Since HugeTLB doesn't
+          support page reclaim, enforcing the limit at page fault time implies
+          that, the application will get SIGBUS signal if it tries to access
+          HugeTLB pages beyond its limit. This requires the application to know
+          beforehand how much HugeTLB pages it would require for its use. The
+          control group is tracked in the third page lru pointer. This means
+          that we cannot use the controller with huge page less than 3 pages.
+
 config CGROUP_PERF
         bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
         depends on PERF_EVENTS && CGROUPS
diff --git a/init/main.c b/init/main.c
index b5cc0a7c4708..b28673087ac0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -68,6 +68,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
 #include <linux/perf_event.h>
+#include <linux/file.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -501,7 +502,7 @@ asmlinkage void __init start_kernel(void)
         setup_per_cpu_areas();
         smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
-        build_all_zonelists(NULL);
+        build_all_zonelists(NULL, NULL);
         page_alloc_init();
 
         printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);
@@ -724,6 +725,7 @@ static initcall_t *initcall_levels[] __initdata = {
         __initcall_end,
 };
 
+/* Keep these in sync with initcalls in include/linux/init.h */
 static char *initcall_level_names[] __initdata = {
         "early",
         "core",
@@ -804,8 +806,8 @@ static noinline int init_post(void)
         system_state = SYSTEM_RUNNING;
         numa_default_policy();
 
-
         current->signal->flags |= SIGNAL_UNKILLABLE;
+        flush_delayed_fput();
 
         if (ramdisk_execute_command) {
                 run_init_process(ramdisk_execute_command);