lkml.org 
[lkml]   [2006]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] fallout from alpha pt_regs patches
    missed irq handler in sys_titan and forgotten prototype update.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    arch/alpha/kernel/proto.h | 2 +-
    arch/alpha/kernel/sys_titan.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h
    index daccd4b..95912ec 100644
    --- a/arch/alpha/kernel/proto.h
    +++ b/arch/alpha/kernel/proto.h
    @@ -36,7 +36,7 @@ extern void cia_pci_tbi(struct pci_contr
    extern struct pci_ops irongate_pci_ops;
    extern int irongate_pci_clr_err(void);
    extern void irongate_init_arch(void);
    -extern void irongate_machine_check(u64, u64, struct pt_regs *);
    +extern void irongate_machine_check(u64, u64);
    #define irongate_pci_tbi ((void *)0)

    /* core_lca.c */
    diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
    index 161d691..29ab7db 100644
    --- a/arch/alpha/kernel/sys_titan.c
    +++ b/arch/alpha/kernel/sys_titan.c
    @@ -204,7 +204,7 @@ static struct hw_interrupt_type titan_ir
    };

    static irqreturn_t
    -titan_intr_nop(int irq, void *dev_id, struct pt_regs *regs)
    +titan_intr_nop(int irq, void *dev_id)
    {
    /*
    * This is a NOP interrupt handler for the purposes of
    --
    1.4.2.GIT
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-09 13:49    [W:0.018 / U:93.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site