summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Estabrook <jay.estabrook@gmail.com>2013-04-07 21:36:09 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-07 12:59:30 -0700
commitaa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9 (patch)
treeeb0297c71209f80de7540157068fdb7a9095496b
parentfe6969094214350e586d56fbfa3ef97cdd74b270 (diff)
downloadlwn-aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9.tar.gz
lwn-aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9.zip
alpha: Add irongate_io to PCI bus resources
Fixes a NULL pointer dereference at boot on UP1500. Cc: stable@vger.kernel.org Reviewed-and-Tested-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Jay Estabrook <jay.estabrook@gmail.com> Signed-off-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Michael Cree <mcree@orcon.net.nz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/alpha/kernel/sys_nautilus.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 4d4c046f708d..1383f8601a93 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -188,6 +188,10 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
extern void free_reserved_mem(void *, void *);
extern void pcibios_claim_one_bus(struct pci_bus *);
+static struct resource irongate_io = {
+ .name = "Irongate PCI IO",
+ .flags = IORESOURCE_IO,
+};
static struct resource irongate_mem = {
.name = "Irongate PCI MEM",
.flags = IORESOURCE_MEM,
@@ -209,6 +213,7 @@ nautilus_init_pci(void)
irongate = pci_get_bus_and_slot(0, 0);
bus->self = irongate;
+ bus->resource[0] = &irongate_io;
bus->resource[1] = &irongate_mem;
pci_bus_size_bridges(bus);