From owner-svn-src-all@FreeBSD.ORG Thu Feb 9 22:48:35 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA81D106566C; Thu, 9 Feb 2012 22:48:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B97198FC12; Thu, 9 Feb 2012 22:48:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q19MmZOo041327; Thu, 9 Feb 2012 22:48:35 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q19MmZo5041325; Thu, 9 Feb 2012 22:48:35 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201202092248.q19MmZo5041325@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 9 Feb 2012 22:48:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231314 - head/sys/mips/mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2012 22:48:35 -0000 Author: gonzo Date: Thu Feb 9 22:48:35 2012 New Revision: 231314 URL: http://svn.freebsd.org/changeset/base/231314 Log: Fix n32 build breakage Modified: head/sys/mips/mips/trap.c Modified: head/sys/mips/mips/trap.c ============================================================================== --- head/sys/mips/mips/trap.c Thu Feb 9 22:34:16 2012 (r231313) +++ head/sys/mips/mips/trap.c Thu Feb 9 22:48:35 2012 (r231314) @@ -765,7 +765,7 @@ dofault: case T_RES_INST + T_USER: { InstFmt inst; - inst = *(InstFmt *)trapframe->pc; + inst = *(InstFmt *)(intptr_t)trapframe->pc; switch (inst.RType.op) { case OP_SPECIAL3: switch (inst.RType.func) { @@ -773,7 +773,7 @@ dofault: /* Register 29 used for TLS */ if (inst.RType.rd == 29) { frame_regs = &(trapframe->zero); - frame_regs[inst.RType.rt] = (register_t)td->td_md.md_tls; + frame_regs[inst.RType.rt] = (register_t)(intptr_t)td->td_md.md_tls; trapframe->pc += sizeof(int); goto out; }