lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Commit 6e8af08dfa 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: Shyam Iyer <shyam_iyer@dell.com>
Signed-off-by: Narendra K <narendra_k@dell.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Narendra_K@Dell.com
2011-03-18 10:22:14 -07:00
committed by Jesse Barnes
parent 864d296cf9
commit 9b373ed18f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/pci/common.c
View File

@@ -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[] = {
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",