summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJay Estabrook <jay.estabrook@gmail.com>2013-04-07 21:36:09 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-12 09:18:09 -0700
commit48631b65db235d68acbde42a1cb6804afbfd283e (patch)
tree55e7140bd5e461111c6778d2b92086a6f50e2477 /arch
parentc55f9197cfc3d968c64ed4e7762214c04090426e (diff)
downloadlinux-stable-48631b65db235d68acbde42a1cb6804afbfd283e.tar.gz
linux-stable-48631b65db235d68acbde42a1cb6804afbfd283e.tar.bz2
linux-stable-48631b65db235d68acbde42a1cb6804afbfd283e.zip
alpha: Add irongate_io to PCI bus resources
commit aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9 upstream. Fixes a NULL pointer dereference at boot on UP1500. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-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 99c0f46f6b9c..dc616b34610e 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -189,6 +189,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,
@@ -210,6 +214,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);