Merge branch 'devel/debug_ll_init' into next/multiplatform

* devel/debug_ll_init:
  ARM: implement debug_ll_io_init()
  + sync to Linux 3.7-rc4

1 files changed, 2 insertions, 0 deletions

diff --git a/init/main.c b/init/main.c
index 9cf77ab138a6..e33e09df3cbc 100644
--- 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