| From aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9 Mon Sep 17 00:00:00 2001 |
| From: Jay Estabrook <jay.estabrook@gmail.com> |
| Date: Sun, 7 Apr 2013 21:36:09 +1200 |
| Subject: alpha: Add irongate_io to PCI bus resources |
| |
| From: Jay Estabrook <jay.estabrook@gmail.com> |
| |
| 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> |
| |
| --- |
| arch/alpha/kernel/sys_nautilus.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/arch/alpha/kernel/sys_nautilus.c |
| +++ b/arch/alpha/kernel/sys_nautilus.c |
| @@ -189,6 +189,10 @@ nautilus_machine_check(unsigned long vec |
| 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); |
