From owner-svn-src-head@freebsd.org  Sat Jun 17 07:36:47 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D3E9BBF3942;
 Sat, 17 Jun 2017 07:36:47 +0000 (UTC) (envelope-from br@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 A4D2D83134;
 Sat, 17 Jun 2017 07:36:47 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5H7akgV021160;
 Sat, 17 Jun 2017 07:36:46 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5H7ak6H021159;
 Sat, 17 Jun 2017 07:36:46 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201706170736.v5H7ak6H021159@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Sat, 17 Jun 2017 07:36:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320050 - head/sys/riscv/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2017 07:36:47 -0000

Author: br
Date: Sat Jun 17 07:36:46 2017
New Revision: 320050
URL: https://svnweb.freebsd.org/changeset/base/320050

Log:
  Undefine temporary macro.
  This fixes world build.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/riscv/include/atomic.h

Modified: head/sys/riscv/include/atomic.h
==============================================================================
--- head/sys/riscv/include/atomic.h	Sat Jun 17 03:05:25 2017	(r320049)
+++ head/sys/riscv/include/atomic.h	Sat Jun 17 07:36:46 2017	(r320050)
@@ -512,6 +512,8 @@ atomic_store_rel_64(volatile uint64_t *p, uint64_t val
 #define	atomic_set_acq_ptr		atomic_set_acq_64
 #define	atomic_subtract_acq_ptr		atomic_subtract_acq_64
 
+#undef ATOMIC_ACQ_REL
+
 static __inline void
 atomic_thread_fence_acq(void)
 {