From: Matt Turner <mattst88@gmail.com>
To: Michael Cree <mcree@orcon.net.nz>
Cc: linux-alpha@vger.kernel.org,
Jay Estabrook <jay.estabrook@gmail.com>,
stable@vger.kernel.org, Matt Turner <mattst88@gmail.com>
Subject: [PATCH] alpha: Add irongate_io to to PCI bus resources
Date: Tue, 20 Nov 2012 20:59:33 -0800 [thread overview]
Message-ID: <1353473973-30908-1-git-send-email-mattst88@gmail.com> (raw)
From: Jay Estabrook <jay.estabrook@gmail.com>
Fixes a NULL pointer dereference at boot on UP1500.
Cc: stable@vger.kernel.org
Signed-off-by: Jay Estabrook <jay.estabrook@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
arch/alpha/kernel/sys_nautilus.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 4d4c046..1383f86 100644
--- 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);
--
1.7.8.6
next reply other threads:[~2012-11-21 4:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 4:59 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-21 4:59 [PATCH] alpha: Add irongate_io to to PCI bus resources Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353473973-30908-1-git-send-email-mattst88@gmail.com \
--to=mattst88@gmail.com \
--cc=jay.estabrook@gmail.com \
--cc=linux-alpha@vger.kernel.org \
--cc=mcree@orcon.net.nz \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).