lkml.org 
[lkml]   [2013]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[015/126] alpha: Add irongate_io to PCI bus resources
    3.6.11.3 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Jay Estabrook <jay.estabrook@gmail.com>

    [ Upstream commit aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9 ]

    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>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    arch/alpha/kernel/sys_nautilus.c | 5 +++++
    1 file changed, 5 insertions(+)

    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.10.4



    \
     
     \ /
      Last update: 2013-05-07 07:22    [W:4.564 / U:1.944 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site