Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 317750a18f74c87be9023bcc42bdbc4cb58c1177..baf1f0f5c4611eb08b3f0eae7995c5d789f8e741 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -442,9 +442,11 @@ void __init __weak smp_setup_processor_id(void)
 {
 }
 
+# if THREAD_SIZE >= PAGE_SIZE
 void __init __weak thread_info_cache_init(void)
 {
 }
+#endif
 
 /*
  * Set up kernel memory allocators
@@ -854,7 +856,7 @@ static void __init kernel_init_freeable(void)
        /*
         * init can allocate pages on any node
         */
-       set_mems_allowed(node_states[N_HIGH_MEMORY]);
+       set_mems_allowed(node_states[N_MEMORY]);
        /*
         * init can run on any cpu.
         */