diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /arch/s390/kernel/setup.c | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 4444875266ee..0f3d44ecbfc6 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
| @@ -1023,6 +1023,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 1023 | setup_vmcoreinfo(); | 1023 | setup_vmcoreinfo(); |
| 1024 | setup_lowcore(); | 1024 | setup_lowcore(); |
| 1025 | 1025 | ||
| 1026 | smp_fill_possible_mask(); | ||
| 1026 | cpu_init(); | 1027 | cpu_init(); |
| 1027 | s390_init_cpu_topology(); | 1028 | s390_init_cpu_topology(); |
| 1028 | 1029 | ||