From owner-svn-src-all@FreeBSD.ORG  Sun Dec 29 17:08:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0A29FE3;
 Sun, 29 Dec 2013 17:08:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EA1EE1299;
 Sun, 29 Dec 2013 17:08:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBTH8Ujx028084;
 Sun, 29 Dec 2013 17:08:30 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBTH8UUx028083;
 Sun, 29 Dec 2013 17:08:30 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201312291708.rBTH8UUx028083@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 29 Dec 2013 17:08:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260043 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Dec 2013 17:08:31 -0000

Author: markj
Date: Sun Dec 29 17:08:30 2013
New Revision: 260043
URL: http://svnweb.freebsd.org/changeset/base/260043

Log:
  The arguments to sched:::off-cpu are the thread and associated process of
  the thread selected to run, not the currently running thread. This fix has
  already been made for ULE in r252070.
  
  PR:		177706
  MFC after:	1 week

Modified:
  head/sys/kern/sched_4bsd.c

Modified: head/sys/kern/sched_4bsd.c
==============================================================================
--- head/sys/kern/sched_4bsd.c	Sun Dec 29 17:03:45 2013	(r260042)
+++ head/sys/kern/sched_4bsd.c	Sun Dec 29 17:08:30 2013	(r260043)
@@ -1032,7 +1032,7 @@ sched_switch(struct thread *td, struct t
 			PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
 #endif
 
-		SDT_PROBE2(sched, , , off__cpu, td, td->td_proc);
+		SDT_PROBE2(sched, , , off__cpu, newtd, newtd->td_proc);
 
                 /* I feel sleepy */
 		lock_profile_release_lock(&sched_lock.lock_object);