Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8b4be3 authored by Jay Estabrook's avatar Jay Estabrook Committed by Linus Torvalds
Browse files

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: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarJay Estabrook <jay.estabrook@gmail.com>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarMichael Cree <mcree@orcon.net.nz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fe696909

arch/alpha/kernel/sys_nautilus.c

+5 −0
Original line number Diff line number Diff line
@@ -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);