diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
commit | 6c82a000a29b93541b5b7db597a083c069755cc9 (patch) | |
tree | b9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6 /arch/x86/kernel/setup.c | |
parent | 5b4d2386c23e5de553fce002892c7691a989b350 (diff) | |
parent | 39415a440ecceb0a5bd3c23686f18f83bb8368c6 (diff) |
Merge branch 'x86/generalize-visws' into x86/core
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 86fc2d624270..987b6fde3a99 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -596,6 +596,7 @@ void __init setup_arch(char **cmdline_p) | |||
596 | { | 596 | { |
597 | #ifdef CONFIG_X86_32 | 597 | #ifdef CONFIG_X86_32 |
598 | memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); | 598 | memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); |
599 | visws_early_detect(); | ||
599 | pre_setup_arch_hook(); | 600 | pre_setup_arch_hook(); |
600 | early_cpu_init(); | 601 | early_cpu_init(); |
601 | #else | 602 | #else |