From owner-svn-src-stable-7@FreeBSD.ORG Mon Jul 25 18:43:24 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E68D110656D5; Mon, 25 Jul 2011 18:43:24 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D60E38FC20; Mon, 25 Jul 2011 18:43:24 +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 p6PIhOxH071119; Mon, 25 Jul 2011 18:43:24 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PIhO5V071117; Mon, 25 Jul 2011 18:43:24 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201107251843.p6PIhO5V071117@svn.freebsd.org> From: Marius Strobl Date: Mon, 25 Jul 2011 18:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224372 - stable/7/sys/sparc64/sparc64 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2011 18:43:25 -0000 Author: marius Date: Mon Jul 25 18:43:24 2011 New Revision: 224372 URL: http://svn.freebsd.org/changeset/base/224372 Log: MFC: r223720 Don't waste a delay slot. Modified: stable/7/sys/sparc64/sparc64/mp_exception.S Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/sparc64/mp_exception.S ============================================================================== --- stable/7/sys/sparc64/sparc64/mp_exception.S Mon Jul 25 18:42:45 2011 (r224371) +++ stable/7/sys/sparc64/sparc64/mp_exception.S Mon Jul 25 18:43:24 2011 (r224372) @@ -235,8 +235,8 @@ ENTRY(tl_ipi_tlb_range_demap) ldx [%g5 + ITA_START], %g1 ldx [%g5 + ITA_END], %g2 -1: or %g1, %g3, %g4 sethi %hi(KERNBASE), %g6 +1: or %g1, %g3, %g4 stxa %g0, [%g4] ASI_DMMU_DEMAP stxa %g0, [%g4] ASI_IMMU_DEMAP flush %g6 @@ -245,7 +245,7 @@ ENTRY(tl_ipi_tlb_range_demap) add %g1, %g6, %g1 cmp %g1, %g2 blt,a,pt %xcc, 1b - nop + sethi %hi(KERNBASE), %g6 IPI_DONE(%g5, %g1, %g2, %g3) retry