lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alpha: Add irongate_io to PCI bus resources

Browse Source 
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>
This commit is contained in:
Jay Estabrook
2013-04-07 21:36:09 +12:00
committed by Linus Torvalds
parent fe69690942
commit aa8b4be3ac
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/alpha/kernel/sys_nautilus.c
View File

@@ -188,6 +188,10 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
extern void free_reserved_mem(void *, void *); extern void free_reserved_mem(void *, void *);
extern void pcibios_claim_one_bus(struct pci_bus *); 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 = { static struct resource irongate_mem = {
.name = "Irongate PCI MEM", .name = "Irongate PCI MEM",
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
@@ -209,6 +213,7 @@ nautilus_init_pci(void)
irongate = pci_get_bus_and_slot(0, 0); irongate = pci_get_bus_and_slot(0, 0);
bus->self = irongate; bus->self = irongate;
bus->resource[0] = &irongate_io;
bus->resource[1] = &irongate_mem; bus->resource[1] = &irongate_mem;
pci_bus_size_bridges(bus); pci_bus_size_bridges(bus);