Merge branch 'akpm-current/current'

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index a8a58e2794a50469d465fad1a6939a4b68ec1114..20dacff539072856f7ea700505d36393abb75bc2 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -59,6 +59,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
+#include <linux/pagemap.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/idr.h>
@@ -463,6 +464,9 @@ void __init __weak thread_stack_cache_init(void)
  */
 static void __init mm_init(void)
 {
+       /* Does address_space.flags still fit into a 32-bit ulong? */
+       BUILD_BUG_ON(AS_LAST_FLAG > 32);
+
        /*
         * page_ext requires contiguous pages,
         * bigger than MAX_ORDER unless SPARSEMEM.
@@ -789,6 +793,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
        }
        WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
 
+       add_latent_entropy();
        return ret;
 }