diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 1a2901562059..879166402bf9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/memblock.h> | 34 | #include <linux/memblock.h> |
35 | #include <linux/seq_file.h> | 35 | #include <linux/seq_file.h> |
36 | #include <linux/console.h> | 36 | #include <linux/console.h> |
37 | #include <linux/mca.h> | ||
38 | #include <linux/root_dev.h> | 37 | #include <linux/root_dev.h> |
39 | #include <linux/highmem.h> | 38 | #include <linux/highmem.h> |
40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
@@ -179,12 +178,6 @@ struct cpuinfo_x86 new_cpu_data __cpuinitdata = {0, 0, 0, 0, -1, 1, 0, 0, -1}; | |||
179 | /* common cpu data for all cpus */ | 178 | /* common cpu data for all cpus */ |
180 | struct cpuinfo_x86 boot_cpu_data __read_mostly = {0, 0, 0, 0, -1, 1, 0, 0, -1}; | 179 | struct cpuinfo_x86 boot_cpu_data __read_mostly = {0, 0, 0, 0, -1, 1, 0, 0, -1}; |
181 | EXPORT_SYMBOL(boot_cpu_data); | 180 | EXPORT_SYMBOL(boot_cpu_data); |
182 | static void set_mca_bus(int x) | ||
183 | { | ||
184 | #ifdef CONFIG_MCA | ||
185 | MCA_bus = x; | ||
186 | #endif | ||
187 | } | ||
188 | 181 | ||
189 | unsigned int def_to_bigsmp; | 182 | unsigned int def_to_bigsmp; |
190 | 183 | ||
@@ -717,7 +710,6 @@ void __init setup_arch(char **cmdline_p) | |||
717 | apm_info.bios = boot_params.apm_bios_info; | 710 | apm_info.bios = boot_params.apm_bios_info; |
718 | ist_info = boot_params.ist_info; | 711 | ist_info = boot_params.ist_info; |
719 | if (boot_params.sys_desc_table.length != 0) { | 712 | if (boot_params.sys_desc_table.length != 0) { |
720 | set_mca_bus(boot_params.sys_desc_table.table[3] & 0x2); | ||
721 | machine_id = boot_params.sys_desc_table.table[0]; | 713 | machine_id = boot_params.sys_desc_table.table[0]; |
722 | machine_submodel_id = boot_params.sys_desc_table.table[1]; | 714 | machine_submodel_id = boot_params.sys_desc_table.table[1]; |
723 | BIOS_revision = boot_params.sys_desc_table.table[2]; | 715 | BIOS_revision = boot_params.sys_desc_table.table[2]; |