- pci-use-pci_bios-as-last-fallback.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     PCI: use PCI_BIOS as last fallback

has been removed from the -mm tree.  Its filename is

     pci-use-pci_bios-as-last-fallback.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: PCI: use PCI_BIOS as last fallback
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>

There was a change in 2.6.17 which affected the order in which the PCI
access methods are probed.  This gives regressions on some machines with
broken BIOS.  the problem is that PCI_BIOS sometimes reports the last bus
wrong, leaving cardbus non-functional.  Previously those system worked fine
with direct access.  Fix it by chaning the order of the probing, having
PCI_BIOS as the last fallback.

Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/i386/pci/init.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff -puN arch/i386/pci/init.c~pci-use-pci_bios-as-last-fallback arch/i386/pci/init.c
--- a/arch/i386/pci/init.c~pci-use-pci_bios-as-last-fallback
+++ a/arch/i386/pci/init.c
@@ -11,13 +11,13 @@ static __init int pci_access_init(void)
 #endif
 	if (raw_pci_ops)
 		return 0;
-#ifdef CONFIG_PCI_BIOS
-	pci_pcbios_init();
-#endif
-	if (raw_pci_ops)
-		return 0;
 #ifdef CONFIG_PCI_DIRECT
 	pci_direct_init();
+	if (raw_pci_ops)
+		return 0;
+#endif
+#ifdef CONFIG_PCI_BIOS
+	pci_pcbios_init();
 #endif
 	return 0;
 }
_

Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux