mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] alpha: Fix up new futex syscall numbers
Date: Mon, 16 Oct 2023 11:31:00 -0000	[thread overview]
Message-ID: <169745586011.3135.7148884690767482787.tip-bot2@tip-bot2> (raw)
In-Reply-To: <cb4bb8e2-7dfe-4ca4-aa70-060f7b2f8f95@app.fastmail.com>

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 <peterz@infradead.org>
AuthorDate:    Mon, 16 Oct 2023 13:12:54 +02:00
Committer:     Peter Zijlstra <peterz@infradead.org>
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 <arnd@arndb.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
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

  parent reply	other threads:[~2023-10-16 11:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-09  1:31 linux-next: manual merge of the block tree with the asm-generic tree Stephen Rothwell
2023-10-09  8:48 ` Peter Zijlstra
2023-10-09  9:00   ` Arnd Bergmann
2023-10-09 14:13     ` Peter Zijlstra
2023-10-09 14:16       ` Jens Axboe
2023-10-09 14:21         ` Arnd Bergmann
2023-10-11 16:21         ` Jens Axboe
2023-10-11 17:54           ` Peter Zijlstra
2023-10-11 21:32             ` Ingo Molnar
2023-10-11 21:42               ` Jens Axboe
2023-10-11 22:01                 ` Ingo Molnar
2023-10-16 11:53                   ` Ingo Molnar
2023-10-17  1:12                     ` Stephen Rothwell
2023-10-16 11:31     ` tip-bot2 for Peter Zijlstra [this message]
2023-10-09  9:33   ` Stephen Rothwell
2023-10-31 22:21 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=169745586011.3135.7148884690767482787.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®