From owner-svn-src-all@freebsd.org  Wed Oct 23 18:27:31 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6522015AAB1;
 Wed, 23 Oct 2019 18:27:31 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46yzPb1y0Zz4WPd;
 Wed, 23 Oct 2019 18:27:31 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22957934;
 Wed, 23 Oct 2019 18:27:31 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9NIRUEv097240;
 Wed, 23 Oct 2019 18:27:30 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9NIRU5V097239;
 Wed, 23 Oct 2019 18:27:30 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201910231827.x9NIRU5V097239@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Wed, 23 Oct 2019 18:27:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353958 - head/lib/libthr/arch/amd64/amd64
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/lib/libthr/arch/amd64/amd64
X-SVN-Commit-Revision: 353958
X-SVN-Commit-Repository: base
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.29
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, 23 Oct 2019 18:27:31 -0000

Author: cem
Date: Wed Oct 23 18:27:30 2019
New Revision: 353958
URL: https://svnweb.freebsd.org/changeset/base/353958

Log:
  libthr: Add missing END() directive for umtx_op_err (amd64)
  
  Like r353929, related to D22122.  No functional change.
  
  Reviewed by:	emaste, kib (earlier version both)

Modified:
  head/lib/libthr/arch/amd64/amd64/_umtx_op_err.S

Modified: head/lib/libthr/arch/amd64/amd64/_umtx_op_err.S
==============================================================================
--- head/lib/libthr/arch/amd64/amd64/_umtx_op_err.S	Wed Oct 23 18:00:22 2019	(r353957)
+++ head/lib/libthr/arch/amd64/amd64/_umtx_op_err.S	Wed Oct 23 18:27:30 2019	(r353958)
@@ -29,8 +29,11 @@
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
-#define	RSYSCALL_ERR(x)	ENTRY(__CONCAT(x, _err));		\
-			mov __CONCAT($SYS_,x),%rax; KERNCALL; ret; 
+#define	RSYSCALL_ERR(x)	ENTRY(__CONCAT(x, _err)); \
+			mov __CONCAT($SYS_,x),%rax; \
+			KERNCALL; \
+			ret; \
+			END(__CONCAT(x, _err));
 
 #define KERNCALL	movq %rcx, %r10; syscall