From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 22 11:08:00 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 40124699;
 Mon, 22 Oct 2012 11:08:00 +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 11F828FC18;
 Mon, 22 Oct 2012 11:08:00 +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 q9MB7xn6097322;
 Mon, 22 Oct 2012 11:07:59 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MB7x4t097320;
 Mon, 22 Oct 2012 11:07:59 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201210221107.q9MB7x4t097320@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 22 Oct 2012 11:07:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241877 - stable/9/sys/sparc64/sparc64
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 11:08:00 -0000

Author: marius
Date: Mon Oct 22 11:07:59 2012
New Revision: 241877
URL: http://svn.freebsd.org/changeset/base/241877

Log:
  MFC: r241734
  
  Let SCHED_ULE give affinity to the CPU the tick interrupt triggered on
  when running tick_process(), similarly to what the x86 equivalents of
  this function do, however employing the less racy sequence also used in
  intr_event_handle().

Modified:
  stable/9/sys/sparc64/sparc64/tick.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/sparc64/sparc64/tick.c
==============================================================================
--- stable/9/sys/sparc64/sparc64/tick.c	Mon Oct 22 11:01:43 2012	(r241876)
+++ stable/9/sys/sparc64/sparc64/tick.c	Mon Oct 22 11:07:59 2012	(r241877)
@@ -245,14 +245,16 @@ tick_process(struct trapframe *tf)
 	struct trapframe *oldframe;
 	struct thread *td;
 
+	td = curthread;
+	td->td_intr_nesting_level++;
 	critical_enter();
 	if (tick_et.et_active) {
-		td = curthread;
 		oldframe = td->td_intr_frame;
 		td->td_intr_frame = tf;
 		tick_et.et_event_cb(&tick_et, tick_et.et_arg);
 		td->td_intr_frame = oldframe;
 	}
+	td->td_intr_nesting_level--;
 	critical_exit();
 }