2021-05-24 18:18:34

by Brian Gerst

[permalink] [raw]
Subject: [PATCH 1/3] x86/uml/syscalls: Remove array index from syscall initializers

Commit 44fe4895f47c ("Stop filling syscall arrays with *_sys_ni_syscall")
removed the index from the initializers for native x86 syscall tables, but
missed the UML syscall tables.

Signed-off-by: Brian Gerst <[email protected]>
---
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 f8323104e353..0575decb5e54 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 5ed665dc785f..95725b5a41ac 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);

--
2.31.1


2021-05-25 11:26:38

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/3] x86/uml/syscalls: Remove array index from syscall initializers

On Tue, May 25, 2021 at 3:17 AM Brian Gerst <[email protected]> wrote:
>
> Commit 44fe4895f47c ("Stop filling syscall arrays with *_sys_ni_syscall")
> removed the index from the initializers for native x86 syscall tables, but
> missed the UML syscall tables.


Ah, right.
I missed cleaning up this in UML. Thanks.

Reviewed-by: Masahiro Yamada <[email protected]>






> Signed-off-by: Brian Gerst <[email protected]>
> ---
> 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 f8323104e353..0575decb5e54 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 5ed665dc785f..95725b5a41ac 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);
>
> --
> 2.31.1
>


--
Best Regards
Masahiro Yamada

Subject: [tip: x86/entry] x86/uml/syscalls: Remove array index from syscall initializers

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 <[email protected]>
AuthorDate: Mon, 24 May 2021 14:17:05 -04:00
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Masahiro Yamada <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
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);