Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Jun 2024 08:47:57 +0100
From:      Nuno Teixeira <eduardo@freebsd.org>
To:        Cy Schubert <Cy.Schubert@cschubert.com>
Cc:        Warner Losh <imp@freebsd.org>, src-committers@freebsd.org,  dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject:   Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME
Message-ID:  <CAFDf7UKCwtabi7JYSXzv9=CvYYY%2B=b7V0mjuA2Vds-yNaLcE_Q@mail.gmail.com>
In-Reply-To: <20240601224055.6a6cac10@slippy>
References:  <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <CAFDf7ULP1X_LgDOrKhMEFF7AgBQPPaJGhbRsaNcUpUOBo9JN9g@mail.gmail.com> <20240601224055.6a6cac10@slippy>

next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002f69bf0619e3707c
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hello!

Thank you for quick fix.

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:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
> NTP:           <cy@nwtime.org>    Web:  https://nwtime.org
>
>                         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 '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 <imp@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=3D108de784513d87bbe850e7b003a73e2=
6b5b54caa
> > >
> > > commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > > Author:     Val Packett <val@packett.cool>
> > > AuthorDate: 2024-05-31 14:45:02 +0000
> > > Commit:     Warner Losh <imp@FreeBSD.org>
> > > 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:  <eduardo@FreeBSD.org>   Web:  https://FreeBSD.org

--0000000000002f69bf0619e3707c
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Hello!</div><div><br></div><div>Thank you for quick f=
ix.</div><div><br></div><div>Cheers,<br></div></div><br><div class=3D"gmail=
_quote"><div dir=3D"ltr" class=3D"gmail_attr">Cy Schubert &lt;<a href=3D"ma=
ilto:Cy.Schubert@cschubert.com">Cy.Schubert@cschubert.com</a>&gt; escreveu =
(domingo, 2/06/2024 =C3=A0(s) 06:41):<br></div><blockquote class=3D"gmail_q=
uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2=
04);padding-left:1ex">Hi eduardo@,<br>
<br>
Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed.<br>
These ports are no longer broken under the latest 15-CURRENT now.<br>
<br>
-- <br>
Cheers,<br>
Cy Schubert &lt;<a href=3D"mailto:Cy.Schubert@cschubert.com" target=3D"_bla=
nk">Cy.Schubert@cschubert.com</a>&gt;<br>
FreeBSD UNIX:=C2=A0 &lt;cy@FreeBSD.org&gt;=C2=A0 =C2=A0Web:=C2=A0 <a href=
=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://FreeB=
SD.org</a><br>
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&lt;<a href=3D"mailto:cy@nwtim=
e.org" target=3D"_blank">cy@nwtime.org</a>&gt;=C2=A0 =C2=A0 Web:=C2=A0 <a h=
ref=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank">https://nwt=
ime.org</a><br>
<br>
=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<br>
<br>
<br>
On Sat, 1 Jun 2024 09:37:00 +0100<br>
Nuno Teixeira &lt;<a href=3D"mailto:eduardo@freebsd.org" target=3D"_blank">=
eduardo@freebsd.org</a>&gt; wrote:<br>
<br>
&gt; Hello,<br>
&gt; <br>
&gt; Having issues building graphics/mesa-dri:<br>
&gt; <br>
&gt; ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value &=
#39;4&#39;<br>
&gt;=C2=A0 =C2=A0 72 |=C2=A0 =C2=A0 case CLOCK_BOOTTIME:<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br>
&gt; /usr/include/sys/_clock_id.h:81:25: note: expanded from macro<br>
&gt; &#39;CLOCK_BOOTTIME&#39;<br>
&gt;=C2=A0 =C2=A0 81 | #define CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 CLOCK_MONOTONIC<br>
&gt;=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^<br>
&gt; /usr/include/sys/_clock_id.h:56:26: note: expanded from macro<br>
&gt; &#39;CLOCK_MONOTONIC&#39;<br>
&gt;=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A04<br>
&gt;=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^<br>
&gt; ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined h=
ere<br>
&gt;=C2=A0 =C2=A0 66 |=C2=A0 =C2=A0 case CLOCK_MONOTONIC:<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^<br>
&gt; /usr/include/sys/_clock_id.h:56:26: note: expanded from macro<br>
&gt; &#39;CLOCK_MONOTONIC&#39;<br>
&gt;=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A04<br>
&gt;=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^<br>
&gt; 1 error generated.<br>
&gt; <br>
&gt; Thanks<br>
&gt; <br>
&gt; Warner Losh &lt;<a href=3D"mailto:imp@freebsd.org" target=3D"_blank">i=
mp@freebsd.org</a>&gt; escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47):<br>
&gt; <br>
&gt; &gt; The branch main has been updated by imp:<br>
&gt; &gt;<br>
&gt; &gt; URL:<br>
&gt; &gt; <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d=
87bbe850e7b003a73e26b5b54caa" rel=3D"noreferrer" target=3D"_blank">https://=
cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b54caa<=
/a><br>
&gt; &gt;<br>
&gt; &gt; commit 108de784513d87bbe850e7b003a73e26b5b54caa<br>
&gt; &gt; Author:=C2=A0 =C2=A0 =C2=A0Val Packett &lt;val@packett.cool&gt;<b=
r>
&gt; &gt; AuthorDate: 2024-05-31 14:45:02 +0000<br>
&gt; &gt; Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh &lt;imp@FreeBSD.org&gt;<br=
>
&gt; &gt; CommitDate: 2024-05-31 14:45:02 +0000<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTON=
IC, not CLOCK_UPTIME<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0The suspend-awareness situation with monotonic=
 clocks across platforms<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0is kind of a mess, let&#39;s try not making it=
 worse.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0On Linux, CLOCK_MONOTONIC does NOT count suspe=
nded time, and<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0CLOCK_BOOTTIME was introduced to INCLUDE suspe=
nded time.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0On OpenBSD, CLOCK_MONOTONIC DOES count suspend=
ed time, and CLOCK_UPTIME<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0was introduced to EXCLUDE suspended time.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0On macOS, it&#39;s the same as OpenBSD, but wi=
th CLOCK_UPTIME_RAW.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Right now, we do not have a monotonic clock th=
at counts suspended time.<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0We have CLOCK_UPTIME as a distinct ID alias, a=
nd CLOCK_BOOTTIME as a<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0preprocessor alias, both being effectively `CL=
OCK_MONOTONIC` for now.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0When we introduce a suspend-aware clock in the=
 future, it would make a<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0lot more sense to do it the OpenBSD/macOS way,=
 i.e. to make<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC include suspended time and mak=
e CLOCK_UPTIME exclude<br>
&gt; &gt; it,<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0because that&#39;s what the name CLOCK_UPTIME =
implies: a deviation from the<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0default intended for the uptime command to all=
ow it to only show the<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0time the system was actually up and not suspen=
ded.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Let&#39;s change the define right now to make =
sure software using the<br>
&gt; &gt; define<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0would not end up using the ID of the wrong clo=
ck in the future, and fix<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0the IDs in the Linux compat code to match the =
expected changes too.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0See <a href=3D"https://bugzilla.mozilla.org/sh=
ow_bug.cgi?id=3D1824084" rel=3D"noreferrer" target=3D"_blank">https://bugzi=
lla.mozilla.org/show_bug.cgi?id=3D1824084</a><br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0for more discussion.<br>
&gt; &gt;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f1=
5118a77 (&quot;clock_gettime: Add Linux aliases for<br>
&gt; &gt; CLOCK_*&quot;)<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada=
637362d (&quot;Map Linux CLOCK_BOOTTIME to native<br>
&gt; &gt; CLOCK_UPTIME.&quot;)<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0<a href=3D"https://w=
ww.patreon.com/valpackett" rel=3D"noreferrer" target=3D"_blank">https://www=
.patreon.com/valpackett</a><br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib, imp<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 <a href=3D"https:=
//reviews.freebsd.org/D39270" rel=3D"noreferrer" target=3D"_blank">https://=
reviews.freebsd.org/D39270</a><br>
&gt; &gt; ---<br>
&gt; &gt;=C2=A0 sys/compat/linux/linux_time.c | 6 +++---<br>
&gt; &gt;=C2=A0 sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0| 2 +-<br>
&gt; &gt;=C2=A0 2 files changed, 4 insertions(+), 4 deletions(-)<br>
&gt; &gt;<br>
&gt; &gt; diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/lin=
ux_time.c<br>
&gt; &gt; index e9e5cf075210..f4dd26dd3d2a 100644<br>
&gt; &gt; --- a/sys/compat/linux/linux_time.c<br>
&gt; &gt; +++ b/sys/compat/linux/linux_time.c<br>
&gt; &gt; @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid=
_t l)<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =
=3D CLOCK_REALTIME;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea=
k;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC:<br>
&gt; &gt; -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_MONOTONIC;<br>
&gt; &gt; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_UPTIME;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea=
k;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_PROCESS_CPUTIME=
_ID:<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =
=3D CLOCK_PROCESS_CPUTIME_ID;<br>
&gt; &gt; @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clock=
id_t l)<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea=
k;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_COARS=
E:<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_RAW:<=
br>
&gt; &gt; -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_MONOTONIC_FAST;<br>
&gt; &gt; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_UPTIME_FAST;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea=
k;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME:<br>
&gt; &gt; -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_UPTIME;<br>
&gt; &gt; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL=
OCK_MONOTONIC;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea=
k;<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_REALTIME_ALARM:=
<br>
&gt; &gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME_ALARM:=
<br>
&gt; &gt; diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h<br>
&gt; &gt; index 47a551428dc3..728346a0f0ab 100644<br>
&gt; &gt; --- a/sys/sys/_clock_id.h<br>
&gt; &gt; +++ b/sys/sys/_clock_id.h<br>
&gt; &gt; @@ -78,7 +78,7 @@<br>
&gt; &gt;=C2=A0 =C2=A0* Linux compatible names.<br>
&gt; &gt;=C2=A0 =C2=A0*/<br>
&gt; &gt;=C2=A0 #if __BSD_VISIBLE<br>
&gt; &gt; -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 CLOCK_UPTIME<br>
&gt; &gt; +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC<br>
&gt; &gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2=
=A0 =C2=A0CLOCK_REALTIME_FAST<br>
&gt; &gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE=
=C2=A0 CLOCK_MONOTONIC_FAST<br>
&gt; &gt;=C2=A0 #endif<br>
&gt; &gt;<br>
&gt; &gt;<br>
&gt; <br>
<br>
</blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre=
fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l=
tr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div><div><font =
color=3D"#888888">
FreeBSD UNIX:=C2=A0 &lt;eduardo@FreeBSD.org&gt;=C2=A0 =C2=A0Web:=C2=A0 <a h=
ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr=
eeBSD.org</a><br></font></div></div></div></div>

--0000000000002f69bf0619e3707c--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UKCwtabi7JYSXzv9=CvYYY%2B=b7V0mjuA2Vds-yNaLcE_Q>