diff mbox series

[1/2] nptl: Provide proper spelling for 32 bit version of futex_abstimed_wait

Message ID 20200916110738.9904-1-lukma@denx.de
State Committed
Delegated to: Lukasz Majewski
Headers show
Series [1/2] nptl: Provide proper spelling for 32 bit version of futex_abstimed_wait | expand

Commit Message

Lukasz Majewski Sept. 16, 2020, 11:07 a.m. UTC
This change provides proper spelling of 32 bit __futex_abstimed_wait_cancelable32
function
---
 sysdeps/nptl/futex-internal.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Andreas Schwab Sept. 16, 2020, 12:04 p.m. UTC | #1
On Sep 16 2020, Lukasz Majewski wrote:

> This change provides proper spelling of 32 bit __futex_abstimed_wait_cancelable32
> function

Ok.

Andreas.
Alistair Francis Sept. 16, 2020, 2:56 p.m. UTC | #2
On Wed, Sep 16, 2020 at 4:07 AM Lukasz Majewski <lukma@denx.de> wrote:
>
> This change provides proper spelling of 32 bit __futex_abstimed_wait_cancelable32
> function

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  sysdeps/nptl/futex-internal.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
> index a2ee5804ec..a4fc1dc52f 100644
> --- a/sysdeps/nptl/futex-internal.c
> +++ b/sysdeps/nptl/futex-internal.c
> @@ -24,10 +24,10 @@
>
>  #ifndef __ASSUME_TIME64_SYSCALLS
>  static int
> -__futex_abstimed_wait_cancellable32 (unsigned int* futex_word,
> -                                     unsigned int expected, clockid_t clockid,
> -                                     const struct __timespec64* abstime,
> -                                     int private)
> +__futex_abstimed_wait_cancelable32 (unsigned int* futex_word,
> +                                    unsigned int expected, clockid_t clockid,
> +                                    const struct __timespec64* abstime,
> +                                    int private)
>  {
>    if (! in_time_t_range (abstime->tv_sec))
>      return -EOVERFLOW;
> @@ -91,8 +91,8 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
>                                   FUTEX_BITSET_MATCH_ANY);
>  #ifndef __ASSUME_TIME64_SYSCALLS
>    if (err == -ENOSYS)
> -    err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
> -                                               clockid, abstime, private);
> +    err = __futex_abstimed_wait_cancelable32 (futex_word, expected,
> +                                              clockid, abstime, private);
>  #endif
>
>    switch (err)
> --
> 2.20.1
>
Lukasz Majewski Sept. 29, 2020, 4:52 p.m. UTC | #3
Hi Adhemerval,

> On Wed, Sep 16, 2020 at 4:07 AM Lukasz Majewski <lukma@denx.de> wrote:
> >
> > This change provides proper spelling of 32 bit
> > __futex_abstimed_wait_cancelable32 function  

Adhemerval, do you have any comments regarding this patch? Or shall I
pull it to -master?

> 
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> 
> Alistair
> 
> > ---
> >  sysdeps/nptl/futex-internal.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/sysdeps/nptl/futex-internal.c
> > b/sysdeps/nptl/futex-internal.c index a2ee5804ec..a4fc1dc52f 100644
> > --- a/sysdeps/nptl/futex-internal.c
> > +++ b/sysdeps/nptl/futex-internal.c
> > @@ -24,10 +24,10 @@
> >
> >  #ifndef __ASSUME_TIME64_SYSCALLS
> >  static int
> > -__futex_abstimed_wait_cancellable32 (unsigned int* futex_word,
> > -                                     unsigned int expected,
> > clockid_t clockid,
> > -                                     const struct __timespec64*
> > abstime,
> > -                                     int private)
> > +__futex_abstimed_wait_cancelable32 (unsigned int* futex_word,
> > +                                    unsigned int expected,
> > clockid_t clockid,
> > +                                    const struct __timespec64*
> > abstime,
> > +                                    int private)
> >  {
> >    if (! in_time_t_range (abstime->tv_sec))
> >      return -EOVERFLOW;
> > @@ -91,8 +91,8 @@ __futex_abstimed_wait_cancelable64 (unsigned int*
> > futex_word, FUTEX_BITSET_MATCH_ANY);
> >  #ifndef __ASSUME_TIME64_SYSCALLS
> >    if (err == -ENOSYS)
> > -    err = __futex_abstimed_wait_cancellable32 (futex_word,
> > expected,
> > -                                               clockid, abstime,
> > private);
> > +    err = __futex_abstimed_wait_cancelable32 (futex_word, expected,
> > +                                              clockid, abstime,
> > private); #endif
> >
> >    switch (err)
> > --
> > 2.20.1
> >  




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Adhemerval Zanella Sept. 29, 2020, 6:11 p.m. UTC | #4
On 29/09/2020 13:52, Lukasz Majewski wrote:
> Hi Adhemerval,
> 
>> On Wed, Sep 16, 2020 at 4:07 AM Lukasz Majewski <lukma@denx.de> wrote:
>>>
>>> This change provides proper spelling of 32 bit
>>> __futex_abstimed_wait_cancelable32 function  
> 
> Adhemerval, do you have any comments regarding this patch? Or shall I
> pull it to -master?
> 

LGTM, thanks.
diff mbox series

Patch

diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
index a2ee5804ec..a4fc1dc52f 100644
--- a/sysdeps/nptl/futex-internal.c
+++ b/sysdeps/nptl/futex-internal.c
@@ -24,10 +24,10 @@ 
 
 #ifndef __ASSUME_TIME64_SYSCALLS
 static int
-__futex_abstimed_wait_cancellable32 (unsigned int* futex_word,
-                                     unsigned int expected, clockid_t clockid,
-                                     const struct __timespec64* abstime,
-                                     int private)
+__futex_abstimed_wait_cancelable32 (unsigned int* futex_word,
+                                    unsigned int expected, clockid_t clockid,
+                                    const struct __timespec64* abstime,
+                                    int private)
 {
   if (! in_time_t_range (abstime->tv_sec))
     return -EOVERFLOW;
@@ -91,8 +91,8 @@  __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
                                  FUTEX_BITSET_MATCH_ANY);
 #ifndef __ASSUME_TIME64_SYSCALLS
   if (err == -ENOSYS)
-    err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
-                                               clockid, abstime, private);
+    err = __futex_abstimed_wait_cancelable32 (futex_word, expected,
+                                              clockid, abstime, private);
 #endif
 
   switch (err)