Attachment 175821 Details for Bug 241338 – another fix, more like upstream

[patch] another fix, more like upstream

rhel5.patch (text/plain), 2.17 KB, created by Michal Schmidt on 2007-08-28 10:27:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2007-08-28 10:27:02 UTC

Size: 2.17 KB

patch

obsolete

>diff -Nurp linux-2.6.18.i686.orig/drivers/pci/probe.c linux-2.6.18.i686/drivers/pci/probe.c
>--- linux-2.6.18.i686.orig/drivers/pci/probe.c	2007-08-27 16:01:40.000000000 +0200
>+++ linux-2.6.18.i686/drivers/pci/probe.c	2007-08-27 16:30:57.000000000 +0200
>@@ -22,6 +22,18 @@ EXPORT_SYMBOL(pci_root_buses);
> 
> LIST_HEAD(pci_devices);
> 
>+/*
>+ * Some device drivers need know if pci is initiated.
>+ * Basically, we think pci is not initiated when there
>+ * is no device in list of pci_devices.
>+ */
>+int no_pci_devices(void)
>+{
>+	return list_empty(&pci_devices);
>+}
>+
>+EXPORT_SYMBOL(no_pci_devices);
>+
> #ifdef HAVE_PCI_LEGACY
> /**
>  * pci_create_legacy_files - create legacy I/O port and memory files
>diff -Nurp linux-2.6.18.i686.orig/include/asm-i386/ide.h linux-2.6.18.i686/include/asm-i386/ide.h
>--- linux-2.6.18.i686.orig/include/asm-i386/ide.h	2006-09-20 05:42:06.000000000 +0200
>+++ linux-2.6.18.i686/include/asm-i386/ide.h	2007-08-27 16:30:57.000000000 +0200
>@@ -46,7 +46,7 @@ static __inline__ unsigned long ide_defa
> 	 *	defined compatibility mode ports for PCI. A user can 
> 	 *	override this using ide= but we must default safe.
> 	 */
>-	if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
>+	if (no_pci_devices()) {
> 		switch(index) {
> 			case 2: return 0x1e8;
> 			case 3: return 0x168;
>diff -Nurp linux-2.6.18.i686.orig/include/linux/pci.h linux-2.6.18.i686/include/linux/pci.h
>--- linux-2.6.18.i686.orig/include/linux/pci.h	2007-08-27 16:02:23.000000000 +0200
>+++ linux-2.6.18.i686/include/linux/pci.h	2007-08-27 16:32:09.000000000 +0200
>@@ -431,6 +431,8 @@ extern struct bus_type pci_bus_type;
>  * code, or pci core code. */
> extern struct list_head pci_root_buses;	/* list of all known PCI buses */
> extern struct list_head pci_devices;	/* list of all devices */
>+/* Some device drivers need know if pci is initiated */
>+extern int no_pci_devices(void);
> 
> void pcibios_fixup_bus(struct pci_bus *);
> int pcibios_enable_device(struct pci_dev *, int mask);
>@@ -705,6 +707,7 @@ static inline struct pci_dev *pci_get_cl
> { return NULL; }
> 
> #define pci_dev_present(ids)	(0)
>+#define no_pci_devices()	(1)
> #define pci_dev_put(dev)	do { } while (0)
> 
> static inline void pci_set_master(struct pci_dev *dev) { }

Actions: View | Diff

Attachments on bug 241338: 155438 | 159196 | 162064 | 175821