From owner-svn-src-all@freebsd.org  Tue Feb 23 10:12:52 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AEC5AB1F58;
 Tue, 23 Feb 2016 10:12:52 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D036E19D1;
 Tue, 23 Feb 2016 10:12:51 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1NACoRC039301;
 Tue, 23 Feb 2016 10:12:50 GMT (envelope-from skra@FreeBSD.org)
Received: (from skra@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1NACowq039299;
 Tue, 23 Feb 2016 10:12:50 GMT (envelope-from skra@FreeBSD.org)
Message-Id: <201602231012.u1NACowq039299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skra set sender to
 skra@FreeBSD.org using -f
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Tue, 23 Feb 2016 10:12:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295920 - in head/sys/arm: arm include
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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Feb 2016 10:12:52 -0000

Author: skra
Date: Tue Feb 23 10:12:50 2016
New Revision: 295920
URL: https://svnweb.freebsd.org/changeset/base/295920

Log:
  Remove redundant __ARM_ARCH >= 6 check in armv6 specific files.

Modified:
  head/sys/arm/arm/cpu_asm-v6.S
  head/sys/arm/include/cpu-v6.h

Modified: head/sys/arm/arm/cpu_asm-v6.S
==============================================================================
--- head/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 09:29:45 2016	(r295919)
+++ head/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 10:12:50 2016	(r295920)
@@ -34,16 +34,9 @@
 #include <machine/armreg.h>
 #include <machine/sysreg.h>
 
-#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
-	mrc CP15_TPIDRPRW(tmp); \
-	add   tmp, tmp, #(TD_PCB)
-#else
-.Lcurpcb:
-	.word _C_LABEL(__pcpu) + PC_CURPCB
-#define GET_PCB(tmp) \
-	ldr   tmp, .Lcurpcb
-#endif
+	mrc	CP15_TPIDRPRW(tmp); \
+	add	tmp, tmp, #(TD_PCB)
 
 /*
  * Define cache functions used by startup code, which counts on the fact that

Modified: head/sys/arm/include/cpu-v6.h
==============================================================================
--- head/sys/arm/include/cpu-v6.h	Tue Feb 23 09:29:45 2016	(r295919)
+++ head/sys/arm/include/cpu-v6.h	Tue Feb 23 10:12:50 2016	(r295920)
@@ -177,15 +177,12 @@ _RF0(cp15_dfar_get, CP15_DFAR(%0))
 _RF0(cp15_ifar_get, CP15_IFAR(%0))
 _RF0(cp15_l2ctlr_get, CP15_L2CTLR(%0))
 #endif
-/* ARMv6+ and XScale */
 _RF0(cp15_actlr_get, CP15_ACTLR(%0))
 _WF1(cp15_actlr_set, CP15_ACTLR(%0))
-#if __ARM_ARCH >= 6
 _WF1(cp15_ats1cpr_set, CP15_ATS1CPR(%0))
 _WF1(cp15_ats1cpw_set, CP15_ATS1CPW(%0))
 _RF0(cp15_par_get, CP15_PAR(%0))
 _RF0(cp15_sctlr_get, CP15_SCTLR(%0))
-#endif
 
 /*CPU id registers */
 _RF0(cp15_midr_get, CP15_MIDR(%0))