svn commit: r367684 - stable/12/sys/kern

Kyle Evans kevans at FreeBSD.org
Sat Nov 14 15:33:40 UTC 2020


Author: kevans
Date: Sat Nov 14 15:33:39 2020
New Revision: 367684
URL: https://svnweb.freebsd.org/changeset/base/367684

Log:
  MFC r367604: 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.

Modified:
  stable/12/sys/kern/kern_umtx.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/kern_umtx.c
==============================================================================
--- stable/12/sys/kern/kern_umtx.c	Sat Nov 14 15:26:18 2020	(r367683)
+++ stable/12/sys/kern/kern_umtx.c	Sat Nov 14 15:33:39 2020	(r367684)
@@ -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
 
@@ -4121,11 +4122,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;


More information about the svn-src-stable mailing list