From nobody Sun Jun 02 07:47:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VsTVg6PX6z5MJBk; Sun, 02 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsTVg61zCz4h48; Sun, 2 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717314491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o3acO/t2ych00gn7QBPDz0Y5BjFgSqYsUtaB6UTUeM0=; b=GOXL/1li5ELbJrp9cB/bqmBOObIjZUeRiDxEFPJQ3jn5V2U367c+i8vLrDHafIAnCvsZqj xMXwM+r2nGJq1kH/tBPmbBF144YQgH+qb2js5TNiDyt1Q5RmdIzZ+S9i4UG88CjZDfNdHk o7CptU9dI/TT5GGuI5yXmj+nvjjAPVbW6lTj/LJNT/h1TrteGqDR5rG2c+eXNmY8HM6Jo7 Ss5GK2Da80i/Tth/PlRIE+1LsQHCtZqjjHiKJH17Kz4c0EC5/C2cPtz2X528Bdj0ncUwy1 iCgfowLQMKUNZVpkNm0LtdRHgpuORxIziAcWaK7nO9KpO6ClnNAeQn2HNZO3FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717314491; a=rsa-sha256; cv=none; b=DqEN72dqgFCBtbpo6NmZhYj2feejfKhrrPZW+/zWRAtj7Qsb2cYpqrPPY+kI5YvlhDQR3m 8NGtvLBWuNqWhmkz5K9+CCmS5f0OECl90idaQGxLHxZGZuxG8RiKy28XFaXRuY0bKd3avh JpFWoh5/Oslmby61faUN2MJnTOhEU0yfkaEKgwOQAHM0BjuI5oUR01c72ErclSuUXt96dV Kg7glTQ2aqJ5yC9G3yj6SHN4AK9Xeb/KTJOI/QjHii6LJV6jt/KxoR6DxhjVE/ISQBIIOB mEgqCa1nqEfGEX1SVz9sofziBe0eBNKg1wZBX1XW6K0hQm5pqz7DTxNE+aA/UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717314491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o3acO/t2ych00gn7QBPDz0Y5BjFgSqYsUtaB6UTUeM0=; b=gj10MquIELGb1AqCJrlpM3RjBnUrIC3rBjXiEHveycmi080FoxQFDlYzEY5GoJIPuCDX9u LPH40vS7fRPGsFe7aa22o6UsgI8fmSTSEqgUHmaVjROo9S9biCiJsS+KdhRw5oc5Yp81yE huxbrvK8p4PNHTxGTWfldX6R7Lz4zpmefZEZopYZltRFQqBm0l2J3JAIwpiSDNpCvRTREn H/QhO35nPoB7KgPvKJlXtr8ScihT6qDtAaTzmG4O4GucdQc53r7PfIJuH1IBL5Aqta+WhA 29EHfNwuYhEDswYvL4+V8G9jyb23TtVlh5wMBKb4FxhkLgS6Jm0q71s9Cu38PA== Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VsTVg5PXCz1K4Z; Sun, 2 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3d19dfb3dceso1868567b6e.1; Sun, 02 Jun 2024 00:48:11 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUTgYUMo1V2H/rubhgdR6rXmPgca7hRL2v8Zco1ZG6mELxkx3sQWTAO+VYDtuQ4Yu3LhHiuH2p44vcDT86FYNySo0kgjBjLg7YVcML4c0/0Q2NtJrBWB7+GlRpbhYvayUyhG16bUg/Up4OTes4oVSREHkEXQbnuEb8+1qJeO2dRg0UJdWTeK5fV7YXbEas= X-Gm-Message-State: AOJu0YwCIKlf8JOBVRzRUSbbjatYv9qfPud3iTO1X7Z9bcAln8hzDDdx TqlXgMnUIoEt1iOBVuTOUQNk4aQL3kQsE8o7cLqUb0La0gcGAp7bIfCqWLImhYMaKDcrFgmn0GE GWopS6p9BwN2zYWf07m1csLha4UI= X-Google-Smtp-Source: AGHT+IGbARQOdqoAbI0KOGLfHPau0GNI37KnWK6VhslK0qfvL9ecBFL3+U509x9QLfjJVDDsj9PW/Py2En3I5lnpAxw= X-Received: by 2002:a05:6808:181f:b0:3d1:be9f:c9a3 with SMTP id 5614622812f47-3d1e31ee10fmr8320737b6e.0.1717314490686; Sun, 02 Jun 2024 00:48:10 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601224055.6a6cac10@slippy> In-Reply-To: <20240601224055.6a6cac10@slippy> From: Nuno Teixeira Date: Sun, 2 Jun 2024 08:47:57 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Cy Schubert Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002f69bf0619e3707c" --0000000000002f69bf0619e3707c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello! Thank you for quick fix. Cheers, Cy Schubert escreveu (domingo, 2/06/2024 =C3=A0= (s) 06:41): > Hi eduardo@, > > Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed. > These ports are no longer broken under the latest 15-CURRENT now. > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > On Sat, 1 Jun 2024 09:37:00 +0100 > Nuno Teixeira wrote: > > > Hello, > > > > Having issues building graphics/mesa-dri: > > > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4= ' > > 72 | case CLOCK_BOOTTIME: > > | ^ > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > > 'CLOCK_BOOTTIME' > > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined he= re > > 66 | case CLOCK_MONOTONIC: > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > 1 error generated. > > > > Thanks > > > > Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:= 47): > > > > > The branch main has been updated by imp: > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e2= 6b5b54caa > > > > > > commit 108de784513d87bbe850e7b003a73e26b5b54caa > > > Author: Val Packett > > > AuthorDate: 2024-05-31 14:45:02 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-05-31 14:45:02 +0000 > > > > > > Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIM= E > > > > > > The suspend-awareness situation with monotonic clocks across > platforms > > > is kind of a mess, let's try not making it worse. > > > > > > On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > > > CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > > > > > On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and > CLOCK_UPTIME > > > was introduced to EXCLUDE suspended time. > > > > > > On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > > > > > Right now, we do not have a monotonic clock that counts suspended > time. > > > We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME a= s > a > > > preprocessor alias, both being effectively `CLOCK_MONOTONIC` for > now. > > > > > > When we introduce a suspend-aware clock in the future, it would > make a > > > lot more sense to do it the OpenBSD/macOS way, i.e. to make > > > CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME > exclude > > > it, > > > because that's what the name CLOCK_UPTIME implies: a deviation > from the > > > default intended for the uptime command to allow it to only show > the > > > time the system was actually up and not suspended. > > > > > > Let's change the define right now to make sure software using the > > > define > > > would not end up using the ID of the wrong clock in the future, > and fix > > > the IDs in the Linux compat code to match the expected changes to= o. > > > > > > See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 > > > for more discussion. > > > > > > Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases f= or > > > CLOCK_*") > > > Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native > > > CLOCK_UPTIME.") > > > Sponsored by: https://www.patreon.com/valpackett > > > Reviewed by: kib, imp > > > Differential Revision: https://reviews.freebsd.org/D39270 > > > --- > > > sys/compat/linux/linux_time.c | 6 +++--- > > > sys/sys/_clock_id.h | 2 +- > > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/sys/compat/linux/linux_time.c > b/sys/compat/linux/linux_time.c > > > index e9e5cf075210..f4dd26dd3d2a 100644 > > > --- a/sys/compat/linux/linux_time.c > > > +++ b/sys/compat/linux/linux_time.c > > > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l= ) > > > *n =3D CLOCK_REALTIME; > > > break; > > > case LINUX_CLOCK_MONOTONIC: > > > - *n =3D CLOCK_MONOTONIC; > > > + *n =3D CLOCK_UPTIME; > > > break; > > > case LINUX_CLOCK_PROCESS_CPUTIME_ID: > > > *n =3D CLOCK_PROCESS_CPUTIME_ID; > > > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t > l) > > > break; > > > case LINUX_CLOCK_MONOTONIC_COARSE: > > > case LINUX_CLOCK_MONOTONIC_RAW: > > > - *n =3D CLOCK_MONOTONIC_FAST; > > > + *n =3D CLOCK_UPTIME_FAST; > > > break; > > > case LINUX_CLOCK_BOOTTIME: > > > - *n =3D CLOCK_UPTIME; > > > + *n =3D CLOCK_MONOTONIC; > > > break; > > > case LINUX_CLOCK_REALTIME_ALARM: > > > case LINUX_CLOCK_BOOTTIME_ALARM: > > > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > > > index 47a551428dc3..728346a0f0ab 100644 > > > --- a/sys/sys/_clock_id.h > > > +++ b/sys/sys/_clock_id.h > > > @@ -78,7 +78,7 @@ > > > * Linux compatible names. > > > */ > > > #if __BSD_VISIBLE > > > -#define CLOCK_BOOTTIME CLOCK_UPTIME > > > +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > > > #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > > > #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > > > #endif > > > > > > > > > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000002f69bf0619e3707c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello!

Thank you for quick f= ix.

Cheers,

Cy Schubert <Cy.Schubert@cschubert.com> escreveu = (domingo, 2/06/2024 =C3=A0(s) 06:41):
Hi eduardo@,

Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed.
These ports are no longer broken under the latest 15-CURRENT now.

--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


On Sat, 1 Jun 2024 09:37:00 +0100
Nuno Teixeira <= eduardo@freebsd.org> wrote:

> Hello,
>
> Having issues building graphics/mesa-dri:
>
> ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value &= #39;4'
>=C2=A0 =C2=A0 72 |=C2=A0 =C2=A0 case CLOCK_BOOTTIME:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
> /usr/include/sys/_clock_id.h:81:25: note: expanded from macro
> 'CLOCK_BOOTTIME'
>=C2=A0 =C2=A0 81 | #define CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 CLOCK_MONOTONIC
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> 'CLOCK_MONOTONIC'
>=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A04
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined h= ere
>=C2=A0 =C2=A0 66 |=C2=A0 =C2=A0 case CLOCK_MONOTONIC:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> 'CLOCK_MONOTONIC'
>=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A04
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> 1 error generated.
>
> Thanks
>
> Warner Losh <i= mp@freebsd.org> escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47):
>
> > The branch main has been updated by imp:
> >
> > URL:
> > https://= cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b54caa<= /a>
> >
> > commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool> > > AuthorDate: 2024-05-31 14:45:02 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-05-31 14:45:02 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTON= IC, not CLOCK_UPTIME
> >
> >=C2=A0 =C2=A0 =C2=A0The suspend-awareness situation with monotonic= clocks across platforms
> >=C2=A0 =C2=A0 =C2=A0is kind of a mess, let's try not making it= worse.
> >
> >=C2=A0 =C2=A0 =C2=A0On Linux, CLOCK_MONOTONIC does NOT count suspe= nded time, and
> >=C2=A0 =C2=A0 =C2=A0CLOCK_BOOTTIME was introduced to INCLUDE suspe= nded time.
> >
> >=C2=A0 =C2=A0 =C2=A0On OpenBSD, CLOCK_MONOTONIC DOES count suspend= ed time, and CLOCK_UPTIME
> >=C2=A0 =C2=A0 =C2=A0was introduced to EXCLUDE suspended time.
> >
> >=C2=A0 =C2=A0 =C2=A0On macOS, it's the same as OpenBSD, but wi= th CLOCK_UPTIME_RAW.
> >
> >=C2=A0 =C2=A0 =C2=A0Right now, we do not have a monotonic clock th= at counts suspended time.
> >=C2=A0 =C2=A0 =C2=A0We have CLOCK_UPTIME as a distinct ID alias, a= nd CLOCK_BOOTTIME as a
> >=C2=A0 =C2=A0 =C2=A0preprocessor alias, both being effectively `CL= OCK_MONOTONIC` for now.
> >
> >=C2=A0 =C2=A0 =C2=A0When we introduce a suspend-aware clock in the= future, it would make a
> >=C2=A0 =C2=A0 =C2=A0lot more sense to do it the OpenBSD/macOS way,= i.e. to make
> >=C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC include suspended time and mak= e CLOCK_UPTIME exclude
> > it,
> >=C2=A0 =C2=A0 =C2=A0because that's what the name CLOCK_UPTIME = implies: a deviation from the
> >=C2=A0 =C2=A0 =C2=A0default intended for the uptime command to all= ow it to only show the
> >=C2=A0 =C2=A0 =C2=A0time the system was actually up and not suspen= ded.
> >
> >=C2=A0 =C2=A0 =C2=A0Let's change the define right now to make = sure software using the
> > define
> >=C2=A0 =C2=A0 =C2=A0would not end up using the ID of the wrong clo= ck in the future, and fix
> >=C2=A0 =C2=A0 =C2=A0the IDs in the Linux compat code to match the = expected changes too.
> >
> >=C2=A0 =C2=A0 =C2=A0See https://bugzi= lla.mozilla.org/show_bug.cgi?id=3D1824084
> >=C2=A0 =C2=A0 =C2=A0for more discussion.
> >
> >=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f1= 5118a77 ("clock_gettime: Add Linux aliases for
> > CLOCK_*")
> >=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada= 637362d ("Map Linux CLOCK_BOOTTIME to native
> > CLOCK_UPTIME.")
> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0https://www= .patreon.com/valpackett
> >=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib, imp
> >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://= reviews.freebsd.org/D39270
> > ---
> >=C2=A0 sys/compat/linux/linux_time.c | 6 +++---
> >=C2=A0 sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 2 +-
> >=C2=A0 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/lin= ux_time.c
> > index e9e5cf075210..f4dd26dd3d2a 100644
> > --- a/sys/compat/linux/linux_time.c
> > +++ b/sys/compat/linux/linux_time.c
> > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid= _t l)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D CLOCK_REALTIME;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_PROCESS_CPUTIME= _ID:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D CLOCK_PROCESS_CPUTIME_ID;
> > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clock= id_t l)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_COARS= E:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_RAW:<= br> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC_FAST;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME_FAST;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_REALTIME_ALARM:=
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME_ALARM:=
> > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> > index 47a551428dc3..728346a0f0ab 100644
> > --- a/sys/sys/_clock_id.h
> > +++ b/sys/sys/_clock_id.h
> > @@ -78,7 +78,7 @@
> >=C2=A0 =C2=A0* Linux compatible names.
> >=C2=A0 =C2=A0*/
> >=C2=A0 #if __BSD_VISIBLE
> > -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 CLOCK_UPTIME
> > +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC
> >=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2= =A0 =C2=A0CLOCK_REALTIME_FAST
> >=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE= =C2=A0 CLOCK_MONOTONIC_FAST
> >=C2=A0 #endif
> >
> >
>



--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000002f69bf0619e3707c--