Re: Linux 2.6.10-ac2

[Coywolf Qi Hunt]

On Thu, 30 Dec 2004 23:42:34 +0000, Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> wrote:
> 
> Forward ported from 2.6.9-ac
> o       Don't probe legacy ISA ide2,3,4,5 on PCI boxes  (Alan Cox)

Below is a cut from the 2.6.10-ac2 patch. I think since
pci_find_device() == NULL is more unlikely, please consider this patch
previousely posted on your original thread: 
http://lkml.org/lkml/2004/12/27/195


diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla-2.6.10/include/asm-i386/ide.h
linux-2.6.10/include/asm-i386/ide.h
--- linux.vanilla-2.6.10/include/asm-i386/ide.h 2004-12-25
21:13:51.000000000 +0000
+++ linux-2.6.10/include/asm-i386/ide.h 2004-12-29 22:34:05.000000000 +0000
@@ -41,16 +41,20 @@

 static __inline__ unsigned long ide_default_io_base(int index)
 {
+       if(pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+               switch(index) {
+                       case 2: return 0x1e8;
+                       case 3: return 0x168;
+                       case 4: return 0x1e0;
+                       case 5: return 0x160;
+                       }
+       }
        switch (index) {
                case 0: return 0x1f0;
                case 1: return 0x170;
-               case 2: return 0x1e8;
-               case 3: return 0x168;
-               case 4: return 0x1e0;
-               case 5: return 0x160;
                default:
                        return 0;
-       }
+       }
 }

 #define IDE_ARCH_OBSOLETE_INIT




-- 
Coywolf Qi Hunt
Homepage http://sosdg.org/~coywolf/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/