diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 01:04:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-17 01:04:14 -0500 |
| commit | 022573c275500e1a50889949f679d04b5446edf6 (patch) | |
| tree | 766ab0e13fc38275466f8544d1bbf4982833cbff /init/main.c | |
| parent | 516d798f656614f59553b1ff3592c2c36102b684 (diff) | |
| parent | a455e2985f57e2a71566bb8850094af38b2c932d (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.8 merge window.
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 9cf77ab138a..e33e09df3cb 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -442,9 +442,11 @@ void __init __weak smp_setup_processor_id(void) | |||
| 442 | { | 442 | { |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | # if THREAD_SIZE >= PAGE_SIZE | ||
| 445 | void __init __weak thread_info_cache_init(void) | 446 | void __init __weak thread_info_cache_init(void) |
| 446 | { | 447 | { |
| 447 | } | 448 | } |
| 449 | #endif | ||
| 448 | 450 | ||
| 449 | /* | 451 | /* |
| 450 | * Set up kernel memory allocators | 452 | * Set up kernel memory allocators |