diff --git a/kernel.spec b/kernel.spec index 2597ec0f9..37f0e12d6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -735,10 +735,12 @@ Patch12401: scsi-mptsas-prevent-heap-overflows-and-unchecked-reads.patch # CVE-2011-1581 Patch12402: bonding-incorrect-tx-queue-offset.patch -# Restore reliable stack backtraces, and hopefully -# fix RHBZ #700718 +# Restore reliable stack backtraces, and hopefully fix RHBZ #700718 Patch12403: x86-dumpstack-correct-stack-dump-info-when-frame-pointer-is-available.patch +# Fix breakage of PCI network adapter names on older Dell systems +Patch12404: x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1251,6 +1253,8 @@ ApplyPatch linux-2.6-defaults-aspm.patch # fixes for ASPM powersave mode ApplyPatch pci-pcie-links-may-not-get-configured-for-aspm-under-powersave-mode.patch ApplyPatch pci-enable-aspm-state-clearing-regardless-of-policy.patch +# Fix breakage of PCI network adapter names on older Dell systems +ApplyPatch x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch #ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch @@ -1979,6 +1983,9 @@ fi # and build. %changelog +* Sat May 07 2011 Chuck Ebbert +- Fix breakage of network device names on Dell systems (#702740) + * Fri May 06 2011 Dave Airlie 2.6.38.5-24 - forgot the cayman PCI IDs. diff --git a/x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch b/x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch new file mode 100644 index 000000000..9cedbadf9 --- /dev/null +++ b/x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch @@ -0,0 +1,55 @@ +From: Narendra K +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 +Signed-off-by: Narendra K +--- +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 +