From owner-svn-src-all@FreeBSD.ORG  Thu Dec 29 16:40:55 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 998DA1065675;
	Thu, 29 Dec 2011 16:40:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87F128FC14;
	Thu, 29 Dec 2011 16:40:55 +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 pBTGetwN063946;
	Thu, 29 Dec 2011 16:40:55 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBTGetCb063943;
	Thu, 29 Dec 2011 16:40:55 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201112291640.pBTGetCb063943@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 29 Dec 2011 16:40:55 +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: r228962 - in head/sys: i386/i386 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 29 Dec 2011 16:40:55 -0000

Author: jhb
Date: Thu Dec 29 16:40:54 2011
New Revision: 228962
URL: http://svn.freebsd.org/changeset/base/228962

Log:
  Use curthread rather than PCPU_GET(curthread).  'curthread' uses
  special-case optimizations on several platforms and is preferred.
  
  Reported by:	dim (indirectly)
  MFC after:	2 weeks

Modified:
  head/sys/i386/i386/sys_machdep.c
  head/sys/mips/mips/gdb_machdep.c

Modified: head/sys/i386/i386/sys_machdep.c
==============================================================================
--- head/sys/i386/i386/sys_machdep.c	Thu Dec 29 16:23:14 2011	(r228961)
+++ head/sys/i386/i386/sys_machdep.c	Thu Dec 29 16:40:54 2011	(r228962)
@@ -553,7 +553,7 @@ user_ldt_free(struct thread *td)
 		return;
 	}
 
-	if (td == PCPU_GET(curthread)) {
+	if (td == curthread) {
 #ifdef XEN
 		i386_reset_ldt(&default_proc_ldt);
 		PCPU_SET(currentldt, (int)&default_proc_ldt);

Modified: head/sys/mips/mips/gdb_machdep.c
==============================================================================
--- head/sys/mips/mips/gdb_machdep.c	Thu Dec 29 16:23:14 2011	(r228961)
+++ head/sys/mips/mips/gdb_machdep.c	Thu Dec 29 16:40:54 2011	(r228962)
@@ -116,7 +116,7 @@ gdb_cpu_getreg(int regnum, size_t *regsz
 {
 
  	*regsz = gdb_cpu_regsz(regnum);
- 	if (kdb_thread  == PCPU_GET(curthread)) {
+ 	if (kdb_thread == curthread) {
 		register_t *zero_ptr = &kdb_frame->zero;
 		return zero_ptr + regnum;
 	}
@@ -154,7 +154,7 @@ gdb_cpu_setreg(int regnum, void *val)
 	switch (regnum) {
 	case GDB_REG_PC:
 		kdb_thrctx->pcb_context[10] = *(register_t *)val;
-		if (kdb_thread	== PCPU_GET(curthread))
+		if (kdb_thread == curthread)
 			kdb_frame->pc = *(register_t *)val;
 	}
 }