diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 08:51:52 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 08:51:52 -0800 |
| commit | fa8e2458ecfc959cd627e25ba86d8eddcb63c887 (patch) | |
| tree | d8c9dec3dac8e97e8591e6507a619959449d6344 /init/main.c | |
| parent | Input: pwm-beeper - add devicetree probing support (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | linux-dev-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.xz linux-dev-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.zip | |
Merge tag 'v3.7-rc4' into next to sync up Wacom bits
Linux 3.7-rc4
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 2 |
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 |