From owner-svn-src-head@FreeBSD.ORG Tue Jul 27 17:33:51 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 879AA106567B; Tue, 27 Jul 2010 17:33:51 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 76EBD8FC2A; Tue, 27 Jul 2010 17:33:51 +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 o6RHXpZ9061724; Tue, 27 Jul 2010 17:33:51 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6RHXpWu061722; Tue, 27 Jul 2010 17:33:51 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201007271733.o6RHXpWu061722@svn.freebsd.org> From: "Jayachandran C." Date: Tue, 27 Jul 2010 17:33:51 +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: r210547 - head/sys/mips/rmi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jul 2010 17:33:51 -0000 Author: jchandra Date: Tue Jul 27 17:33:51 2010 New Revision: 210547 URL: http://svn.freebsd.org/changeset/base/210547 Log: The changes in r210542 moved setting counter_upper and counter_lower_last outside the critical section - fix that. Reported by: mav Modified: head/sys/mips/rmi/tick.c Modified: head/sys/mips/rmi/tick.c ============================================================================== --- head/sys/mips/rmi/tick.c Tue Jul 27 17:33:02 2010 (r210546) +++ head/sys/mips/rmi/tick.c Tue Jul 27 17:33:51 2010 (r210547) @@ -120,10 +120,10 @@ tick_ticker(void) if (ticktock < t_lower_last) t_upper++; t_lower_last = ticktock; - critical_exit(); - DPCPU_SET(counter_upper, t_upper); DPCPU_SET(counter_lower_last, t_lower_last); + critical_exit(); + ret = ((uint64_t)t_upper << 32) | t_lower_last; return (ret); }