From: Andreas Schwab <schwab@suse.de>
To: linux-ia64@vger.kernel.org
Subject: Fix PCIE and SHPC hotplug drivers for ia64
Date: Thu, 04 Mar 2004 17:28:31 +0000 [thread overview]
Message-ID: <jek720wmgw.fsf@sykes.suse.de> (raw)
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."
next reply other threads:[~2004-03-04 17:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-04 17:28 Andreas Schwab [this message]
2004-03-04 18:03 ` Fix PCIE and SHPC hotplug drivers for ia64 Greg KH
2004-03-04 18:30 ` Sy, Dely L
2004-03-10 22:24 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jek720wmgw.fsf@sykes.suse.de \
--to=schwab@suse.de \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox