From owner-svn-src-all@freebsd.org  Wed Jun  8 22:29:32 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 1ACA5B6F07A;
 Wed,  8 Jun 2016 22:29:32 +0000 (UTC)
 (envelope-from andrew@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 DC353195B;
 Wed,  8 Jun 2016 22:29:31 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58MTVEU042898;
 Wed, 8 Jun 2016 22:29:31 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58MTUZc042896;
 Wed, 8 Jun 2016 22:29:30 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201606082229.u58MTUZc042896@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 8 Jun 2016 22:29:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301700 - 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.22
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: Wed, 08 Jun 2016 22:29:32 -0000

Author: andrew
Date: Wed Jun  8 22:29:30 2016
New Revision: 301700
URL: https://svnweb.freebsd.org/changeset/base/301700

Log:
  Remove the ARMv4/ARMv5 userland atomic support from struct proc on armv6.
  Nothing should use this on armv6 as we use the atomic instructions added in
  ARMv6k.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/arm/genassym.c
  head/sys/arm/include/proc.h

Modified: head/sys/arm/arm/genassym.c
==============================================================================
--- head/sys/arm/arm/genassym.c	Wed Jun  8 22:28:57 2016	(r301699)
+++ head/sys/arm/arm/genassym.c	Wed Jun  8 22:29:30 2016	(r301700)
@@ -101,8 +101,10 @@ ASSYM(TD_PROC, offsetof(struct thread, t
 ASSYM(TD_MD, offsetof(struct thread, td_md));
 ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
 ASSYM(MD_TP, offsetof(struct mdthread, md_tp));
+#if __ARM_ARCH < 6
 ASSYM(MD_RAS_START, offsetof(struct mdthread, md_ras_start));
 ASSYM(MD_RAS_END, offsetof(struct mdthread, md_ras_end));
+#endif
 
 ASSYM(TF_SPSR, offsetof(struct trapframe, tf_spsr));
 ASSYM(TF_R0, offsetof(struct trapframe, tf_r0));

Modified: head/sys/arm/include/proc.h
==============================================================================
--- head/sys/arm/include/proc.h	Wed Jun  8 22:28:57 2016	(r301699)
+++ head/sys/arm/include/proc.h	Wed Jun  8 22:29:30 2016	(r301700)
@@ -54,8 +54,10 @@ struct mdthread {
 	int md_ptrace_instr_alt;
 	int md_ptrace_addr_alt;
 	register_t md_tp;
+#if __ARM_ARCH < 6
 	void *md_ras_start;
 	void *md_ras_end;
+#endif
 };
 
 struct mdproc {