From owner-svn-src-stable-10@FreeBSD.ORG  Thu Aug  7 17:49:42 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 E7960CD9
 for <svn-src-stable-10@freebsd.org>; Thu,  7 Aug 2014 17:49:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B9D842E4A
 for <svn-src-stable-10@freebsd.org>; Thu,  7 Aug 2014 17:49:42 +0000 (UTC)
Received: from ian (uid 1311) (envelope-from ian@FreeBSD.org) id 2ad6
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 17:49:42 +0000
From: Ian Lepore <ian@FreeBSD.org>
Date: Thu, 7 Aug 2014 17:49:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r269679 - stable/10/sys/arm/arm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e3bc36.2ad6.63b3a50d@svn.freebsd.org>
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2014 17:49:43 -0000

Author: ian
Date: Thu Aug  7 17:49:42 2014
New Revision: 269679
URL: http://svnweb.freebsd.org/changeset/base/269679

Log:
  MFC r256691, r256748: casuword fixes
  
    Use unsigned compare against KERNBASE addr.
    Use atomic ops on armv6.

Modified:
  stable/10/sys/arm/arm/fusu.S
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/fusu.S
==============================================================================
--- stable/10/sys/arm/arm/fusu.S	Thu Aug  7 17:40:46 2014	(r269678)
+++ stable/10/sys/arm/arm/fusu.S	Thu Aug  7 17:49:42 2014	(r269679)
@@ -66,11 +66,27 @@ ENTRY(casuword)
 	stmfd	sp!, {r4, r5}
 	adr	r4, .Lcasuwordfault
 	str	r4, [r3, #PCB_ONFAULT]
+#ifdef _ARM_ARCH_6
+1:    
+	cmp     r0, #KERNBASE
+	mvnhs   r0, #0
+	bhs     2f
+	
+	ldrex   r5, [r0]
+	cmp     r5, r1
+	movne   r0, r5
+	bne     2f
+	strex   r5, r2, [r0]
+	cmp     r5, #0
+	bne     1b
+#else
 	ldrt	r5, [r0]
 	cmp	r5, r1
 	movne	r0, r5
 	streqt	r2, [r0]
+#endif
 	moveq	r0, r1
+2:
 	ldmfd	sp!, {r4, r5}
 	mov	r1, #0x00000000
 	str	r1, [r3, #PCB_ONFAULT]