From owner-svn-src-user@FreeBSD.ORG Tue Apr 6 08:35:05 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 82A83106566C; Tue, 6 Apr 2010 08:35:05 +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 32C838FC12; Tue, 6 Apr 2010 08:35:05 +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 o368Z5u8098894; Tue, 6 Apr 2010 08:35:05 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o368Z5qm098891; Tue, 6 Apr 2010 08:35:05 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004060835.o368Z5qm098891@svn.freebsd.org> From: Juli Mallett Date: Tue, 6 Apr 2010 08:35:05 +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: r206255 - user/jmallett/octeon/sys/mips/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: Tue, 06 Apr 2010 08:35:05 -0000 Author: jmallett Date: Tue Apr 6 08:35:04 2010 New Revision: 206255 URL: http://svn.freebsd.org/changeset/base/206255 Log: Move interrupt enable to configure_final(). Modified: user/jmallett/octeon/sys/mips/mips/autoconf.c user/jmallett/octeon/sys/mips/mips/machdep.c Modified: user/jmallett/octeon/sys/mips/mips/autoconf.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/autoconf.c Tue Apr 6 08:30:21 2010 (r206254) +++ user/jmallett/octeon/sys/mips/mips/autoconf.c Tue Apr 6 08:35:04 2010 (r206255) @@ -102,6 +102,7 @@ static void configure_final(dummy) void *dummy; { + intr_enable(); cninit_finish(); Modified: user/jmallett/octeon/sys/mips/mips/machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/machdep.c Tue Apr 6 08:30:21 2010 (r206254) +++ user/jmallett/octeon/sys/mips/mips/machdep.c Tue Apr 6 08:35:04 2010 (r206255) @@ -373,11 +373,9 @@ mips_vector_init(void) * when handler is installed for it */ set_intr_mask(ALL_INT_MASK); - intr_enable(); /* Clear BEV in SR so we start handling our own exceptions */ mips_wr_status(mips_rd_status() & ~SR_BOOT_EXC_VEC); - } /*