projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe69690
)
alpha: Add irongate_io to PCI bus resources
author
Jay Estabrook
<jay.estabrook@gmail.com>
Sun, 7 Apr 2013 09:36:09 +0000
(21:36 +1200)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 7 Apr 2013 19:59:30 +0000
(12:59 -0700)
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>
arch/alpha/kernel/sys_nautilus.c
patch
|
blob
|
history
diff --git
a/arch/alpha/kernel/sys_nautilus.c
b/arch/alpha/kernel/sys_nautilus.c
index
4d4c046
..
1383f86
100644
(file)
--- 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);