From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDC8FC433F5 for ; Fri, 26 Nov 2021 10:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376619AbhKZKEL (ORCPT ); Fri, 26 Nov 2021 05:04:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:47710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376422AbhKZKCK (ORCPT ); Fri, 26 Nov 2021 05:02:10 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 74E7C61038; Fri, 26 Nov 2021 09:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637920738; bh=tZGY6dNlK8/AMHNAonDLG4iu1hKpaY0sGMxToT3+ww8=; h=From:To:Cc:Subject:Date:From; b=UDh+vGEdTW6y2n4FeBdt5x5NVGQEI9O3V1xrUy/z6WM4RyGpxkN4QAdRcy1KqY/eu kVp9g08zhj8tp+ob6f2qHbp6cSr27rFguUj8REH5DCHTw4y3w8mItndi7+mFsN8dyW y+Thu/GwrtPuRuyjBdZpmLM9/zqmhYoIw7r2tq4VvBa+KvKf7DPkhfz1UVixRxvDlc IEycN/bEFEUZL2vWTIzv0A8tU0i9Mm+7LyysYCh5GX+Vjgry5d6mzX7E33zP+0MJh1 cAVTAzcSo1YYrTH8Wl5EPJzIM66XH61bCEbXWygB4LQQOeEiHW9a3CGKZXJuom8paH sxOiEXStsF8Gw== From: Arnd Bergmann To: Thomas Gleixner Cc: Arnd Bergmann , Stephen Rothwell , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Nick Hu , Greentime Hu , Vincent Chen , Rich Felker , Max Filippov , Geert Uytterhoeven , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH] futex: Fix sparc32/m68k/nds32 build regression Date: Fri, 26 Nov 2021 10:58:40 +0100 Message-Id: <20211126095852.455492-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann 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 Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present") Signed-off-by: Arnd Bergmann --- 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