From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 29 22:21:59 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7ADD9106564A;
	Wed, 29 Feb 2012 22:21:59 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A6368FC15;
	Wed, 29 Feb 2012 22:21:59 +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 q1TMLxIg047638;
	Wed, 29 Feb 2012 22:21:59 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1TMLxPA047636;
	Wed, 29 Feb 2012 22:21:59 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201202292221.q1TMLxPA047636@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Wed, 29 Feb 2012 22:21:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232319 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Feb 2012 22:21:59 -0000

Author: cognet
Date: Wed Feb 29 22:21:58 2012
New Revision: 232319
URL: http://svn.freebsd.org/changeset/base/232319

Log:
  We shouldn't dereference curthread here

Modified:
  projects/armv6/sys/arm/arm/swtch.S

Modified: projects/armv6/sys/arm/arm/swtch.S
==============================================================================
--- projects/armv6/sys/arm/arm/swtch.S	Wed Feb 29 22:06:44 2012	(r232318)
+++ projects/armv6/sys/arm/arm/swtch.S	Wed Feb 29 22:21:58 2012	(r232319)
@@ -348,7 +348,6 @@ ENTRY(cpu_switch)
 	beq	.Lcs_same_vector
 	str	r0, [r7]		/* Otherwise, update it */
 
-#if !defined(CPU_ARM11) && !defined(CPU_CORTEXA) && !defined(CPU_MV_PJ4B)
 	/*
 	 * Need to sync the cache to make sure that last store is
 	 * visible to the MMU.
@@ -358,7 +357,6 @@ ENTRY(cpu_switch)
 	mov	r1, #4
 	mov	lr, pc
 	ldr	pc, [r2, #CF_DCACHE_WB_RANGE]
-#endif
 
 .Lcs_same_vector:
 #endif /* PMAP_INCLUDE_PTE_SYNC */
@@ -396,7 +394,6 @@ ENTRY(cpu_switch)
 	str	r6, [r4, #TD_LOCK]
 	ldr	r6, .Lblocked_lock
 	GET_CURTHREAD_PTR(r3)
-	ldr	r3, [r3]
 
 1:
 	ldr	r4, [r3, #TD_LOCK]