56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From: Narendra K <narendra_k@dell.com>
|
|
Subject: [PATCH] x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems.
|
|
|
|
Commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f 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>
|
|
---
|
|
RHBZ #702740
|
|
http://marc.info/?l=linux-pci&m=130046899115205&q=raw
|
|
|
|
arch/x86/pci/common.c | 14 +++++++-------
|
|
1 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
|
|
index 5fe7502..92df322 100644
|
|
--- a/arch/x86/pci/common.c
|
|
+++ b/arch/x86/pci/common.c
|
|
@@ -247,13 +247,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
|
|
},
|
|
#endif /* __i386__ */
|
|
{
|
|
- .callback = find_sort_method,
|
|
- .ident = "Dell System",
|
|
- .matches = {
|
|
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
|
|
- },
|
|
- },
|
|
- {
|
|
.callback = set_bf_sort,
|
|
.ident = "Dell PowerEdge 1950",
|
|
.matches = {
|
|
@@ -294,6 +287,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
|
|
},
|
|
},
|
|
{
|
|
+ .callback = find_sort_method,
|
|
+ .ident = "Dell System",
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
|
|
+ },
|
|
+ },
|
|
+ {
|
|
.callback = set_bf_sort,
|
|
.ident = "HP ProLiant BL20p G3",
|
|
.matches = {
|
|
--
|
|
1.7.3.1
|
|
|