From owner-svn-src-user@FreeBSD.ORG Mon Apr 19 06:37:19 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C8B01065675; Mon, 19 Apr 2010 06:37:19 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 317EB8FC22; Mon, 19 Apr 2010 06:37:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3J6bJRA020983; Mon, 19 Apr 2010 06:37:19 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3J6bJ25020979; Mon, 19 Apr 2010 06:37:19 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004190637.o3J6bJ25020979@svn.freebsd.org> From: Juli Mallett Date: Mon, 19 Apr 2010 06:37:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206830 - in user/jmallett/octeon/sys/mips: include mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 06:37:19 -0000 Author: jmallett Date: Mon Apr 19 06:37:18 2010 New Revision: 206830 URL: http://svn.freebsd.org/changeset/base/206830 Log: Go back to old cpu_intr calling convention. Modified: user/jmallett/octeon/sys/mips/include/intr_machdep.h user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/intr_machdep.c Modified: user/jmallett/octeon/sys/mips/include/intr_machdep.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/intr_machdep.h Mon Apr 19 06:01:58 2010 (r206829) +++ user/jmallett/octeon/sys/mips/include/intr_machdep.h Mon Apr 19 06:37:18 2010 (r206830) @@ -43,7 +43,7 @@ void cpu_establish_hardintr(const char * void *, int, int, void **); void cpu_establish_softintr(const char *, driver_filter_t *, void (*)(void*), void *, int, int, void **); -register_t cpu_intr(struct trapframe *); +void cpu_intr(struct trapframe *); /* * Allow a platform to override the default hard interrupt mask and unmask Modified: user/jmallett/octeon/sys/mips/mips/exception.S ============================================================================== --- user/jmallett/octeon/sys/mips/mips/exception.S Mon Apr 19 06:01:58 2010 (r206829) +++ user/jmallett/octeon/sys/mips/mips/exception.S Mon Apr 19 06:37:18 2010 (r206830) @@ -604,6 +604,7 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S and a1, a1, ~SR_INT_MASK or a1, a1, a0 SAVE_REG(a1, SR, sp) + REG_L v0, CALLFRAME_RA + KERN_REG_SIZE(sp) RESTORE_CPU # v0 contains the return address. sync eret Modified: user/jmallett/octeon/sys/mips/mips/intr_machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/intr_machdep.c Mon Apr 19 06:01:58 2010 (r206829) +++ user/jmallett/octeon/sys/mips/mips/intr_machdep.c Mon Apr 19 06:37:18 2010 (r206830) @@ -213,7 +213,7 @@ cpu_establish_softintr(const char *name, mips_intrcnt_setname(mips_intr_counters[irq], event->ie_fullname); } -register_t +void cpu_intr(struct trapframe *tf) { struct intr_event *event; @@ -266,6 +266,4 @@ cpu_intr(struct trapframe *tf) KASSERT(i == 0, ("all interrupts handled")); critical_exit(); - - return (tf->pc); }