From owner-svn-src-head@freebsd.org  Wed Nov 11 22:35:24 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 77283468295;
 Wed, 11 Nov 2020 22:35:24 +0000 (UTC)
 (envelope-from kevans@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 4CWfgw31Y4z3v7V;
 Wed, 11 Nov 2020 22:35:24 +0000 (UTC)
 (envelope-from kevans@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 5A8981BD5A;
 Wed, 11 Nov 2020 22:35:24 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ABMZOoq068581;
 Wed, 11 Nov 2020 22:35:24 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ABMZOH9068580;
 Wed, 11 Nov 2020 22:35:24 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202011112235.0ABMZOH9068580@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 11 Nov 2020 22:35:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r367604 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 367604
X-SVN-Commit-Repository: base
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.34
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: Wed, 11 Nov 2020 22:35:24 -0000

Author: kevans
Date: Wed Nov 11 22:35:23 2020
New Revision: 367604
URL: https://svnweb.freebsd.org/changeset/base/367604

Log:
  umtx: drop incorrect timespec32 definition
  
  This works for amd64, but none others -- drop it, because we already have a
  proper definition in sys/compat/freebsd32/freebsd32.h that correctly uses
  time32_t.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Wed Nov 11 22:18:24 2020	(r367603)
+++ head/sys/kern/kern_umtx.c	Wed Nov 11 22:35:23 2020	(r367604)
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 
 #ifdef COMPAT_FREEBSD32
+#include <compat/freebsd32/freebsd32.h>
 #include <compat/freebsd32/freebsd32_proto.h>
 #endif
 
@@ -4127,11 +4128,6 @@ sys__umtx_op(struct thread *td, struct _umtx_op_args *
 }
 
 #ifdef COMPAT_FREEBSD32
-
-struct timespec32 {
-	int32_t tv_sec;
-	int32_t tv_nsec;
-};
 
 struct umtx_time32 {
 	struct	timespec32	timeout;