Commit 9b373ed1 authored by Narendra_K@Dell.com's avatar Narendra_K@Dell.com Committed by Jesse Barnes

x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems

Commit 6e8af08d enables pci=bfsort on
future Dell systems. But the identification string 'Dell System' matches
on already existing whitelist, which do not have SMBIOS type 0xB1,
causing pci=bfsort not being set on existing whitelist.

This patch fixes the regression by moving the type 0xB1 check beyond the
existing whitelist so that existing whitelist is walked before.
Signed-off-by: default avatarShyam Iyer <shyam_iyer@dell.com>
Signed-off-by: default avatarNarendra K <narendra_k@dell.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 864d296c
...@@ -246,13 +246,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { ...@@ -246,13 +246,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
}, },
}, },
#endif /* __i386__ */ #endif /* __i386__ */
{
.callback = find_sort_method,
.ident = "Dell System",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
},
},
{ {
.callback = set_bf_sort, .callback = set_bf_sort,
.ident = "Dell PowerEdge 1950", .ident = "Dell PowerEdge 1950",
...@@ -293,6 +286,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { ...@@ -293,6 +286,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R900"), DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R900"),
}, },
}, },
{
.callback = find_sort_method,
.ident = "Dell System",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
},
},
{ {
.callback = set_bf_sort, .callback = set_bf_sort,
.ident = "HP ProLiant BL20p G3", .ident = "HP ProLiant BL20p G3",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment