LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] futex: Fix sparc32/m68k/nds32 build regression
@ 2021-11-26  9:58 Arnd Bergmann
  2021-11-26 20:55 ` [tip: locking/core] " tip-bot2 for Arnd Bergmann
  2021-12-10 10:39 ` [PATCH] " Ingo Molnar
  0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2021-11-26  9:58 UTC (permalink / raw)
  To: Thomas Gleixner
  Cc: Arnd Bergmann, Stephen Rothwell, Ingo Molnar, Peter Zijlstra,
	Darren Hart, Davidlohr Bueso, André Almeida, Nick Hu,
	Greentime Hu, Vincent Chen, Rich Felker, Max Filippov,
	Geert Uytterhoeven, linux-kernel, linux-arch

From: Arnd Bergmann <arnd@arndb.de>

In one of the revisions of my futex cleanup series, I botched
up a rename of some function names, breaking sparc32, m68k
and nds32:

include/asm-generic/futex.h:17:2: error: implicit declaration of function 'futex_atomic_cmpxchg_inatomic_local_generic'; did you mean 'futex_atomic_cmpxchg_inatomic_local'? [-Werror=implicit-function-declaration]

Fix the macros to point to the correct functions.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/asm-generic/futex.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 30e7fa63b5df..66d6843bfd02 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -14,9 +14,9 @@
  *
  */
 #define futex_atomic_cmpxchg_inatomic(uval, uaddr, oldval, newval) \
-	futex_atomic_cmpxchg_inatomic_local_generic(uval, uaddr, oldval, newval)
+	futex_atomic_cmpxchg_inatomic_local(uval, uaddr, oldval, newval)
 #define arch_futex_atomic_op_inuser(op, oparg, oval, uaddr) \
-	arch_futex_atomic_op_inuser_local_generic(op, oparg, oval, uaddr)
+	futex_atomic_op_inuser_local(op, oparg, oval, uaddr)
 #endif /* CONFIG_SMP */
 #endif
 
-- 
2.29.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip: locking/core] futex: Fix sparc32/m68k/nds32 build regression
  2021-11-26  9:58 [PATCH] futex: Fix sparc32/m68k/nds32 build regression Arnd Bergmann
@ 2021-11-26 20:55 ` tip-bot2 for Arnd Bergmann
  2021-12-10 10:39 ` [PATCH] " Ingo Molnar
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Arnd Bergmann @ 2021-11-26 20:55 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Stephen Rothwell, Arnd Bergmann, Thomas Gleixner, x86, linux-kernel

The following commit has been merged into the locking/core branch of tip:

Commit-ID:     4e0d84634445ed550498d613a49ea8f6cfa5e66c
Gitweb:        https://git.kernel.org/tip/4e0d84634445ed550498d613a49ea8f6cfa5e66c
Author:        Arnd Bergmann <arnd@arndb.de>
AuthorDate:    Fri, 26 Nov 2021 10:58:40 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 26 Nov 2021 21:50:36 +01:00

futex: Fix sparc32/m68k/nds32 build regression

The recent futex cleanup series, botched up a rename of some function
names, breaking sparc32, m68k and nds32:

include/asm-generic/futex.h:17:2: error: implicit declaration of function 'futex_atomic_cmpxchg_inatomic_local_generic'; did you mean 'futex_atomic_cmpxchg_inatomic_local'? [-Werror=implicit-function-declaration]

Fix the macros to point to the correct functions.

Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20211126095852.455492-1-arnd@kernel.org

---
 include/asm-generic/futex.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 30e7fa6..66d6843 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -14,9 +14,9 @@
  *
  */
 #define futex_atomic_cmpxchg_inatomic(uval, uaddr, oldval, newval) \
-	futex_atomic_cmpxchg_inatomic_local_generic(uval, uaddr, oldval, newval)
+	futex_atomic_cmpxchg_inatomic_local(uval, uaddr, oldval, newval)
 #define arch_futex_atomic_op_inuser(op, oparg, oval, uaddr) \
-	arch_futex_atomic_op_inuser_local_generic(op, oparg, oval, uaddr)
+	futex_atomic_op_inuser_local(op, oparg, oval, uaddr)
 #endif /* CONFIG_SMP */
 #endif
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] futex: Fix sparc32/m68k/nds32 build regression
  2021-11-26  9:58 [PATCH] futex: Fix sparc32/m68k/nds32 build regression Arnd Bergmann
  2021-11-26 20:55 ` [tip: locking/core] " tip-bot2 for Arnd Bergmann
@ 2021-12-10 10:39 ` Ingo Molnar
  2021-12-10 10:49   ` Arnd Bergmann
  1 sibling, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2021-12-10 10:39 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Thomas Gleixner, Arnd Bergmann, Stephen Rothwell, Ingo Molnar,
	Peter Zijlstra, Darren Hart, Davidlohr Bueso, André Almeida,
	Nick Hu, Greentime Hu, Vincent Chen, Rich Felker, Max Filippov,
	Geert Uytterhoeven, linux-kernel, linux-arch


* Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> In one of the revisions of my futex cleanup series, I botched
> up a rename of some function names, breaking sparc32, m68k
> and nds32:
> 
> include/asm-generic/futex.h:17:2: error: implicit declaration of function 'futex_atomic_cmpxchg_inatomic_local_generic'; did you mean 'futex_atomic_cmpxchg_inatomic_local'? [-Werror=implicit-function-declaration]
> 
> Fix the macros to point to the correct functions.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  include/asm-generic/futex.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
> index 30e7fa63b5df..66d6843bfd02 100644
> --- a/include/asm-generic/futex.h
> +++ b/include/asm-generic/futex.h
> @@ -14,9 +14,9 @@
>   *
>   */
>  #define futex_atomic_cmpxchg_inatomic(uval, uaddr, oldval, newval) \
> -	futex_atomic_cmpxchg_inatomic_local_generic(uval, uaddr, oldval, newval)
> +	futex_atomic_cmpxchg_inatomic_local(uval, uaddr, oldval, newval)
>  #define arch_futex_atomic_op_inuser(op, oparg, oval, uaddr) \
> -	arch_futex_atomic_op_inuser_local_generic(op, oparg, oval, uaddr)
> +	futex_atomic_op_inuser_local(op, oparg, oval, uaddr)
>  #endif /* CONFIG_SMP */
>  #endif

Doesn't solve the regression on MIPS defconfig:

# nice -n 5 make -j76 CROSS_COMPILE=/home/mingo/gcc/cross/bin/mips64-linux- ARCH=mips kernel/futex/syscalls.o
  CALL    scripts/atomic/check-atomics.sh
  CALL    scripts/checksyscalls.sh
  CC      kernel/futex/syscalls.o
In file included from kernel/futex/futex.h:12,
                 from kernel/futex/syscalls.c:7:
./arch/mips/include/asm/futex.h: In function 'arch_futex_atomic_op_inuser':
./arch/mips/include/asm/futex.h:89:23: error: implicit declaration of function 'arch_futex_atomic_op_inuser_local'; did you mean 'futex_atomic_op_inuser_local'? [-Werror=implicit-function-declaration]
   89 |                 ret = arch_futex_atomic_op_inuser_local(op, oparg, oval,\

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] futex: Fix sparc32/m68k/nds32 build regression
  2021-12-10 10:39 ` [PATCH] " Ingo Molnar
@ 2021-12-10 10:49   ` Arnd Bergmann
  0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2021-12-10 10:49 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Thomas Gleixner, Arnd Bergmann, Stephen Rothwell, Ingo Molnar,
	Peter Zijlstra, Darren Hart, Davidlohr Bueso, André Almeida,
	Nick Hu, Greentime Hu, Vincent Chen, Rich Felker, Max Filippov,
	Geert Uytterhoeven, Linux Kernel Mailing List, linux-arch

On Fri, Dec 10, 2021 at 11:39 AM Ingo Molnar <mingo@kernel.org> wrote:
> * Arnd Bergmann <arnd@kernel.org> wrote:
> > From: Arnd Bergmann <arnd@arndb.de>

> Doesn't solve the regression on MIPS defconfig:
> ./arch/mips/include/asm/futex.h: In function 'arch_futex_atomic_op_inuser':
> ./arch/mips/include/asm/futex.h:89:23: error: implicit declaration of function 'arch_futex_atomic_op_inuser_local'; did you mean 'futex_atomic_op_inuser_local'? [-Werror=implicit-function-declaration]
>    89 |                 ret = arch_futex_atomic_op_inuser_local(op, oparg, oval,\

Right, mips and xtensa still have the same problem that I fixed for
the others, I posted
another fix after the 0day bot reported it. I think

https://lore.kernel.org/lkml/20211203080823.2938839-1-arnd@kernel.org/

should address the remaining regression.

       Arnd

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-12-10 10:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-26  9:58 [PATCH] futex: Fix sparc32/m68k/nds32 build regression Arnd Bergmann
2021-11-26 20:55 ` [tip: locking/core] " tip-bot2 for Arnd Bergmann
2021-12-10 10:39 ` [PATCH] " Ingo Molnar
2021-12-10 10:49   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).