From: "tip-bot2 for Brian Gerst" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Masahiro Yamada <masahiroy@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/entry] x86/uml/syscalls: Remove array index from syscall initializers
Date: Tue, 25 May 2021 15:00:51 -0000 [thread overview]
Message-ID: <162195485173.29796.5553283004529180620.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210524181707.132844-2-brgerst@gmail.com>
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: d48ca5b98fa5d21444e04bb17373d339200b679a
Gitweb: https://git.kernel.org/tip/d48ca5b98fa5d21444e04bb17373d339200b679a
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Mon, 24 May 2021 14:17:05 -04:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 25 May 2021 16:59:23 +02:00
x86/uml/syscalls: Remove array index from syscall initializers
The recent syscall table generator rework removed the index from the
initializers for native x86 syscall tables, but missed the UML syscall
tables.
Fixes: 44fe4895f47c ("Stop filling syscall arrays with *_sys_ni_syscall")
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210524181707.132844-2-brgerst@gmail.com
---
arch/x86/um/sys_call_table_32.c | 2 +-
arch/x86/um/sys_call_table_64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/um/sys_call_table_32.c b/arch/x86/um/sys_call_table_32.c
index f832310..0575dec 100644
--- a/arch/x86/um/sys_call_table_32.c
+++ b/arch/x86/um/sys_call_table_32.c
@@ -31,7 +31,7 @@
#include <asm/syscalls_32.h>
#undef __SYSCALL
-#define __SYSCALL(nr, sym) [ nr ] = sym,
+#define __SYSCALL(nr, sym) sym,
extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c
index 5ed665d..95725b5 100644
--- a/arch/x86/um/sys_call_table_64.c
+++ b/arch/x86/um/sys_call_table_64.c
@@ -39,7 +39,7 @@
#include <asm/syscalls_64.h>
#undef __SYSCALL
-#define __SYSCALL(nr, sym) [ nr ] = sym,
+#define __SYSCALL(nr, sym) sym,
extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
next prev parent reply other threads:[~2021-05-25 15:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 18:17 [PATCH 0/3] x86: Syscall table cleanups Brian Gerst
2021-05-24 18:17 ` [PATCH 1/3] x86/uml/syscalls: Remove array index from syscall initializers Brian Gerst
2021-05-25 11:22 ` Masahiro Yamada
2021-05-25 15:00 ` tip-bot2 for Brian Gerst [this message]
2021-05-24 18:17 ` [PATCH 2/3] x86/syscalls: Remove -Wno-override-init for syscall tables Brian Gerst
2021-05-25 12:01 ` Masahiro Yamada
2021-05-25 15:00 ` [tip: x86/entry] " tip-bot2 for Brian Gerst
2021-05-24 18:17 ` [PATCH 3/3] x86/syscalls: Don't sdjust CFLAGS " Brian Gerst
2021-05-25 12:01 ` Masahiro Yamada
2021-05-25 15:00 ` [tip: x86/entry] x86/syscalls: Don't adjust " tip-bot2 for Brian Gerst
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=162195485173.29796.5553283004529180620.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=brgerst@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.