Fix PCIE and SHPC hotplug drivers for ia64

Fix PCIE and SHPC hotplug drivers for ia64

[Andreas Schwab]

This patch fixes the PCIE and SHPC hotplug driver for ia64.  The function
pcibios_set_irq_routing only exists on x86, and acpi_bridges_head may be
NULL, so don't crash.

Andreas.

--- linux-2.6.3/drivers/pci/hotplug/pciehp_pci.c.~1~	2004-02-24 16:22:18.375705230 +0100
+++ linux-2.6.3/drivers/pci/hotplug/pciehp_pci.c	2004-02-24 16:27:00.829344589 +0100
@@ -103,7 +103,7 @@ int pciehp_unconfigure_device(struct pci
  */
 int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
 {
-#if !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
+#if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
 	int rc;
 	u16 temp_word;
 	struct pci_dev fakedev;
--- linux-2.6.3/drivers/pci/hotplug/pciehprm_acpi.c.~1~	2004-02-27 16:33:20.000000000 +0100
+++ linux-2.6.3/drivers/pci/hotplug/pciehprm_acpi.c	2004-02-29 16:22:58.086155839 +0100
@@ -1265,7 +1265,8 @@ static int print_acpi_resources (struct 
 int pciehprm_print_pirt(void)
 {
 	dbg("PCIEHPRM ACPI Slots\n");
-	print_acpi_resources (acpi_bridges_head);
+	if (acpi_bridges_head)
+		print_acpi_resources (acpi_bridges_head);
 
 	return 0;
 }
--- linux-2.6.3/drivers/pci/hotplug/shpchp_pci.c.~1~	2004-02-24 16:21:45.532011299 +0100
+++ linux-2.6.3/drivers/pci/hotplug/shpchp_pci.c	2004-02-24 16:27:22.883998276 +0100
@@ -101,7 +101,7 @@ int shpchp_unconfigure_device(struct pci
  */
 int shpchp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
 {
-#if !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
+#if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
 	int rc;
 	u16 temp_word;
 	struct pci_dev fakedev;

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Fix PCIE and SHPC hotplug drivers for ia64

[Greg KH]

On Thu, Mar 04, 2004 at 06:28:31PM +0100, Andreas Schwab wrote:
> This patch fixes the PCIE and SHPC hotplug driver for ia64.  The function
> pcibios_set_irq_routing only exists on x86, and acpi_bridges_head may be
> NULL, so don't crash.

This looks sane to me, Dely?

thanks,

greg k-h

RE: Fix PCIE and SHPC hotplug drivers for ia64

[Sy, Dely L]

On Thursday, March 04, 2004 10:04 AM, Greg KH wrote:
> On Thu, Mar 04, 2004 at 06:28:31PM +0100, Andreas Schwab wrote:
> > This patch fixes the PCIE and SHPC hotplug driver for ia64. The
function
> > pcibios_set_irq_routing only exists on x86, and acpi_bridges_head
may be
> > NULL, so don't crash.

> This looks sane to me, Dely?

Thanks for the fix.  It looks good to me.

Thanks,
Dely

Re: Fix PCIE and SHPC hotplug drivers for ia64

[Greg KH]

On Thu, Mar 04, 2004 at 06:28:31PM +0100, Andreas Schwab wrote:
> This patch fixes the PCIE and SHPC hotplug driver for ia64.  The function
> pcibios_set_irq_routing only exists on x86, and acpi_bridges_head may be
> NULL, so don't crash.

Applied, thanks.

greg k-h