|
@@ -24,7 +24,6 @@ unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
|
|
|
|
|
|
unsigned int pci_early_dump_regs;
|
|
|
static int pci_bf_sort;
|
|
|
-static int smbios_type_b1_flag;
|
|
|
int pci_routeirq;
|
|
|
int noioapicquirk;
|
|
|
#ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
|
|
@@ -197,34 +196,18 @@ static int __init set_bf_sort(const struct dmi_system_id *d)
|
|
|
static void __init read_dmi_type_b1(const struct dmi_header *dm,
|
|
|
void *private_data)
|
|
|
{
|
|
|
- u8 *d = (u8 *)dm + 4;
|
|
|
+ u8 *data = (u8 *)dm + 4;
|
|
|
|
|
|
if (dm->type != 0xB1)
|
|
|
return;
|
|
|
- switch (((*(u32 *)d) >> 9) & 0x03) {
|
|
|
- case 0x00:
|
|
|
- printk(KERN_INFO "dmi type 0xB1 record - unknown flag\n");
|
|
|
- break;
|
|
|
- case 0x01: /* set pci=bfsort */
|
|
|
- smbios_type_b1_flag = 1;
|
|
|
- break;
|
|
|
- case 0x02: /* do not set pci=bfsort */
|
|
|
- smbios_type_b1_flag = 2;
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
+ if ((((*(u32 *)data) >> 9) & 0x03) == 0x01)
|
|
|
+ set_bf_sort((const struct dmi_system_id *)private_data);
|
|
|
}
|
|
|
|
|
|
static int __init find_sort_method(const struct dmi_system_id *d)
|
|
|
{
|
|
|
- dmi_walk(read_dmi_type_b1, NULL);
|
|
|
-
|
|
|
- if (smbios_type_b1_flag == 1) {
|
|
|
- set_bf_sort(d);
|
|
|
- return 0;
|
|
|
- }
|
|
|
- return -1;
|
|
|
+ dmi_walk(read_dmi_type_b1, (void *)d);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/*
|