Skip to contentSkip to conversation

s390/uapi: Remove obsolete unistd_32.h from Kbuild file

PATCH Applied Thomas Huth 4 participants 6 messages Jul 1 – Jul 9 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390/uapi: Remove obsolete unistd_32.h from Kbuild file

From: Thomas Huth <[email protected]>

unistd_32.h is not build anymore since commit 4ac286c4a8d90 ("s390/syscalls: Switch to generic system call table generation"). Thus drop the superfluous line from the Kbuild file now, too.

---
 arch/s390/include/uapi/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/s390/include/uapi/asm/Kbuild +0 -1
index 46c1ff0b842a1..378151cef3cce 100644
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
-generated-y += unistd_32.h
 generated-y += unistd_64.h
Signature · 1 line
2.54.0
#1 lore raw

On Wed, Jul 01, 2026 at 03:47:27PM +0200, Thomas Huth wrote:

Hi Thomas,

Quoted 16 lines

From: Thomas Huth <[email protected]>

unistd_32.h is not build anymore since commit 4ac286c4a8d90 ("s390/syscalls: Switch to generic system call table generation"). Thus drop the superfluous line from the Kbuild file now, too.

---
 arch/s390/include/uapi/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/s390/include/uapi/asm/Kbuild +0 -0
index 46c1ff0b842a1..378151cef3cce 100644

arch/s390/include/uapi/asm/Kbuild line 3

Quoted 4 lines
arch/s390/include/uapi/asm/Kbuild +0 -1
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
-generated-y += unistd_32.h
 generated-y += unistd_64.h

On repeated builds it results in:

SYSHDR arch/s390/include/generated/uapi/asm/unistd_32.h REMOVE arch/s390/include/generated/uapi/asm/unistd_32.h

A complete removal would require changes to arch/s390/kernel/syscalls/Makefile at least, but we still might want to have unistd_32.h around.

Thanks!

maintainer
#2 lore raw
Quoted 22 lines · Alexander Gordeev

On Wed, Jul 01, 2026 at 03:47:27PM +0200, Thomas Huth wrote:

Hi Thomas,

Quoted 18 lines

From: Thomas Huth <[email protected]>

unistd_32.h is not build anymore since commit 4ac286c4a8d90 ("s390/syscalls: Switch to generic system call table generation"). Thus drop the superfluous line from the Kbuild file now, too.

---
 arch/s390/include/uapi/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/s390/include/uapi/asm/Kbuild +0 -0
index 46c1ff0b842a1..378151cef3cce 100644
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
Quoted 7 lines

arch/s390/include/uapi/asm/Kbuild line 3

Quoted 2 lines
arch/s390/include/uapi/asm/Kbuild +0 -1
-generated-y += unistd_32.h
 generated-y += unistd_64.h

On repeated builds it results in:

SYSHDR arch/s390/include/generated/uapi/asm/unistd_32.h REMOVE arch/s390/include/generated/uapi/asm/unistd_32.h

How did you achieve that unistd_32.h is actually generated? The required syscall table information to generate such a header file is not present. This looks very odd to me.

The above should be impossible with current upstream code, and I cannot reproduce it. Any chance you applied Thomas' patch on top of an old commit which still includes compat support?

Quoted 2 lines

A complete removal would require changes to arch/s390/kernel/syscalls/Makefile at least,

I don't think so.

Quoted 1 line

but we still might want to have unistd_32.h around.

No, that doesn't make sense. compat support is completely gone, including all header files. The patch looks fine as it is for me, but we need to sort out what you reported.

#3 lore raw
Quoted 5 lines · Heiko Carstens
Quoted 4 lines

On repeated builds it results in:

SYSHDR arch/s390/include/generated/uapi/asm/unistd_32.h REMOVE arch/s390/include/generated/uapi/asm/unistd_32.h

Quoted 7 lines

How did you achieve that unistd_32.h is actually generated? The required syscall table information to generate such a header file is not present. This looks very odd to me.

The above should be impossible with current upstream code, and I cannot reproduce it. Any chance you applied Thomas' patch on top of an old commit which still includes compat support?

I can not reproduce it anymore of course, but I am pretty sure I was trying exactly that :/

Quoted 10 lines
Quoted 2 lines

A complete removal would require changes to arch/s390/kernel/syscalls/Makefile at least,

I don't think so.

Quoted 1 line

but we still might want to have unistd_32.h around.

No, that doesn't make sense. compat support is completely gone, including all header files. The patch looks fine as it is for me, but we need to sort out what you reported.

Yes, my report is false. Sorry for the noise.

Thanks!

maintainer
#4 lore raw
Quoted 22 lines · Alexander Gordeev
Quoted 5 lines · Heiko Carstens
Quoted 4 lines

On repeated builds it results in:

SYSHDR arch/s390/include/generated/uapi/asm/unistd_32.h REMOVE arch/s390/include/generated/uapi/asm/unistd_32.h

Quoted 7 lines

How did you achieve that unistd_32.h is actually generated? The required syscall table information to generate such a header file is not present. This looks very odd to me.

The above should be impossible with current upstream code, and I cannot reproduce it. Any chance you applied Thomas' patch on top of an old commit which still includes compat support?

I can not reproduce it anymore of course, but I am pretty sure I was trying exactly that :/

Quoted 5 lines
Quoted 2 lines

A complete removal would require changes to arch/s390/kernel/syscalls/Makefile at least,

I don't think so.

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

but we still might want to have unistd_32.h around.

No, that doesn't make sense. compat support is completely gone, including all header files. The patch looks fine as it is for me, but we need to sort out what you reported.

Yes, my report is false. Sorry for the noise.

Maybe you have not started with a clean tree.
Anyhow, I'm picking up this patch then.

maintainer Reviewed-by on v1 1/1 Applied
#5 lore raw
In reply to Thomas Huth
Quoted 10 lines · Thomas Huth

From: Thomas Huth <[email protected]>

unistd_32.h is not build anymore since commit 4ac286c4a8d90 ("s390/syscalls: Switch to generic system call table generation"). Thus drop the superfluous line from the Kbuild file now, too.

---
 arch/s390/include/uapi/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)

Applied, thank you!