From owner-svn-src-stable-10@FreeBSD.ORG  Tue Feb  4 16:29:31 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 56F795C8;
 Tue,  4 Feb 2014 16:29: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 3EE201E0D;
 Tue,  4 Feb 2014 16:29:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14GTVti045751;
 Tue, 4 Feb 2014 16:29:31 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14GTV0Y045750;
 Tue, 4 Feb 2014 16:29:31 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201402041629.s14GTV0Y045750@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 4 Feb 2014 16:29:31 +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: r261490 - 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
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
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: Tue, 04 Feb 2014 16:29:31 -0000

Author: eadler
Date: Tue Feb  4 16:29:30 2014
New Revision: 261490
URL: http://svnweb.freebsd.org/changeset/base/261490

Log:
  MFC r258787:
  	r258780 should not have applied to .S files.

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

Modified: stable/10/sys/arm/arm/cpufunc_asm_pj4b.S
==============================================================================
--- stable/10/sys/arm/arm/cpufunc_asm_pj4b.S	Tue Feb  4 16:18:38 2014	(r261489)
+++ stable/10/sys/arm/arm/cpufunc_asm_pj4b.S	Tue Feb  4 16:29:30 2014	(r261490)
@@ -237,7 +237,7 @@ ENTRY(pj4b_config)
 	orr	r0, r0, #(1 << 27)	/* Critical word first sequencing disable */
 	orr	r0, r0, #(1 << 29)	/* Disable MO device read / write */
 	orr	r0, r0, #(1 << 30)	/* L1 cache strict round-robin replacement policy*/
-	orr	r0, r0, #(1U << 31)	/* Enable write evict */
+	orr	r0, r0, #(1 << 31)	/* Enable write evict */
 	mcr	p15, 1, r0, c15, c1, 2
 #if defined(SMP)
 	/* Set SMP mode in Auxiliary Control Register */