From patchwork Mon Oct 16 11:31:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 153348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3390724vqb; Mon, 16 Oct 2023 04:31:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyyrkRDIy2rvjZIpXedu3Ummo7bdPzsRjjnf8D3IL9VQI5GRtVfCz9v3xnnBG5y8ScikwH X-Received: by 2002:a17:902:ce84:b0:1c3:a4f2:7c99 with SMTP id f4-20020a170902ce8400b001c3a4f27c99mr36928875plg.4.1697455886332; Mon, 16 Oct 2023 04:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697455886; cv=none; d=google.com; s=arc-20160816; b=jZDsRMUVpi68qMXijcEzocVq9q7Hs8MyO5dAVBd+OlV+73LgzKT/wRnSUF5ZlDvRRi AoOsktGSXk/7lN79r3dNiF1qhLaMsye6iM24AyVpSn3McW+qqYW853wynLUZGgVh5Ns/ ylrZetyD+vEkLW1tZWn9iWGll+d8NXsjbZI43SnGcMfOMQap4U1W6usscNfiKtqlHIVv 4OjlEh6WVcqJjblpSQave6B5fRRkFmEicbvhZZti7o1ZZUDEUfHLnXCNFMfv5bImbxSt h7ButD30qHwZDqihvspiQjBMRM12aV9Ma8SucD8DbyhPUGx12cXc22p30Pr5/b1CipDi 367g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=O0d6/dutpP/geIhcM1VULDwECIjIHiDxDL5beJt6QgU=; fh=P2PeOTQd4lsPMYtyAvPTR98DcmBctZwcQHKBinbNiLQ=; b=GCZVHV1JEEn44YNtSYN8dDbJIXeXKwkOGaC8fbqQEI62nUXZgd4iwLj9mmFEW6K4rG HkK7ldoa/qPuPA1ZvDTu5RL5yfqcZ8uIQS4Amr6DPRmhUKjP126GO6nsCtoKoa0/dDOr vmBQoX2cdA5qLmaeYerGKhbIwhWGkAu4ZPQ9twBG9tEo9k8aPfdppQfaneVtzFrkIRVl /jRQfQTXndUvx+b/YP1FvHQ8nR7MOoDRAtj5BghoQU6fuGBxr9VMmRtUj/dVRcGG7I26 yfWZHYSIfC+JEnJneBsiq6DyTp73OJA5sn4u5DeMFY2PwMZpb9sQGyv+4ONUMVGwtPlQ jS0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GEcDKHUe; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=a24HrChw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id x8-20020a170902b40800b001c38666f77dsi9859741plr.596.2023.10.16.04.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 04:31:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GEcDKHUe; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=a24HrChw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 379C280AE83F; Mon, 16 Oct 2023 04:31:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230090AbjJPLbO (ORCPT + 18 others); Mon, 16 Oct 2023 07:31:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233495AbjJPLbG (ORCPT ); Mon, 16 Oct 2023 07:31:06 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B486CDC; Mon, 16 Oct 2023 04:31:02 -0700 (PDT) Date: Mon, 16 Oct 2023 11:31:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697455860; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0d6/dutpP/geIhcM1VULDwECIjIHiDxDL5beJt6QgU=; b=GEcDKHUeOjoUk9Oftp9KsjqJ5LkiFaPTpYPjTtgWGJK+5urZSBMsk2kC+Ve+seEbd3M5gI 9NotfL/ofAAVwquQwuLFI6oU3wu86QsE79dSCcaYL23RhXYw34SfkDBYKCCTfOjFGfSctg QAPSTdfwWU5hSXFZd6UjburrPm+MPqC2deKBsUfeIYRZNwnDay8yy3FqaXzlC1Ig5xZhdt tehUwGEmCVs33Y5DSP8QO+k0Y7nInF2ErDPT7u5VUL+IFz7F/QXtUQMgO38d1CcWlYVFD7 oWYzw8xpjAk7oW4+KoeiVdUitqpj8GCPHzbEzTl5Si9Sj0djrBpHWmrSmiCt1w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697455860; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0d6/dutpP/geIhcM1VULDwECIjIHiDxDL5beJt6QgU=; b=a24HrChwDnatPi9EPWyqIRoFPt/EFEjgZmgE6GB1Jdn61zdXn172S/2+sJ/8uTXRtU86h2 eZj/7t8M1EhYl4Aw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] alpha: Fix up new futex syscall numbers Cc: Arnd Bergmann , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169745586011.3135.7148884690767482787.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 16 Oct 2023 04:31:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779911503088306078 X-GMAIL-MSGID: 1779911503088306078 The following commit has been merged into the locking/core branch of tip: Commit-ID: dcc134510eefaec6dda4fe71ab824f0300ed9f9f Gitweb: https://git.kernel.org/tip/dcc134510eefaec6dda4fe71ab824f0300ed9f9f Author: Peter Zijlstra AuthorDate: Mon, 16 Oct 2023 13:12:54 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 16 Oct 2023 13:20:54 +02:00 alpha: Fix up new futex syscall numbers As per Arnd, Alpha syscalls since time64 are offset by 120, retain this offset. Fixes: 9f6c532f59b2 ("futex: Add sys_futex_wake()") Reported-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/cb4bb8e2-7dfe-4ca4-aa70-060f7b2f8f95@app.fastmail.com --- arch/alpha/kernel/syscalls/syscall.tbl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl index b1865f9..b68f1f5 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -492,6 +492,7 @@ 560 common set_mempolicy_home_node sys_ni_syscall 561 common cachestat sys_cachestat 562 common fchmodat2 sys_fchmodat2 -563 common futex_wake sys_futex_wake -564 common futex_wait sys_futex_wait -565 common futex_requeue sys_futex_requeue +# 563 reserved for map_shadow_stack +564 common futex_wake sys_futex_wake +565 common futex_wait sys_futex_wait +566 common futex_requeue sys_futex_requeue