Commit:     ef300e42234eac066b193c871714203d999b481c
Parent:     856a514b408fd1b147bf95916811980982fa40d0
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Sun May 6 18:31:18 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Fri May 11 14:28:30 2007 +0100

    [MIPS] Define and use vi_handler_t for vectored interrupt handlers.
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
 arch/mips/kernel/traps.c  |    4 ++--
 include/asm-mips/system.h |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b511ed3..200de02 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1128,7 +1128,7 @@ void mips_srs_free(int set)
        clear_bit(set, &sr->sr_allocated);
-static void *set_vi_srs_handler(int n, void *addr, int srs)
+static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
        unsigned long handler;
        unsigned long old_handler = vi_handlers[n];
@@ -1217,7 +1217,7 @@ static void *set_vi_srs_handler(int n, void *addr, int 
        return (void *)old_handler;
-void *set_vi_handler(int n, void *addr)
+void *set_vi_handler(int n, vi_handler_t addr)
        return set_vi_srs_handler(n, addr, 0);
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 3713d25..bb0b289 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -464,7 +464,10 @@ static inline unsigned long __cmpxchg_local(volatile void 
* ptr,
 extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned 
long len);
-extern void *set_vi_handler (int n, void *addr);
+typedef void (*vi_handler_t)(void);
+extern void *set_vi_handler (int n, vi_handler_t addr);
 extern void *set_except_vector(int n, void *addr);
 extern unsigned long ebase;
 extern void per_cpu_trap_init(void);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to