Skip to contentSkip to conversation

update-linux-headers: Remove "asm-s390/unistd_32.h"

PATCH Applied Cédric Le Goater 3 participants 6 messages Jan 12 – Jan 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 update-linux-headers: Remove "asm-s390/unistd_32.h"

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
 scripts/update-linux-headers.sh | 1 -
 1 file changed, 1 deletion(-)
scripts/update-linux-headers.sh +0 -1
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755
@@ -154,7 +154,6 @@ EOF
     mkdir -p "$output/include/standard-headers/asm-$arch"
     if [ $arch = s390 ]; then
         cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
-        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
         cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
     fi
     if [ $arch = arm64 ]; then
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 20 lines · Cédric Le Goater

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
  scripts/update-linux-headers.sh | 1 -
  1 file changed, 1 deletion(-)
scripts/update-linux-headers.sh +0 -0
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755

scripts/update-linux-headers.sh EOF · line 158

Quoted 6 lines
scripts/update-linux-headers.sh +0 -1
@@ -154,7 +154,6 @@ EOF
      mkdir -p "$output/include/standard-headers/asm-$arch"
      if [ $arch = s390 ]; then
          cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
-        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
          cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
      fi

I think it would make sense to remove linux-headers/asm-s390/unistd_32.h in this patch, too, otherwise this will stay around as a stale file, I guess?

Anyway,

#2 lore raw
Quoted 16 lines · Thomas Huth
Quoted 15 lines · Cédric Le Goater

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
  scripts/update-linux-headers.sh | 1 -

  1 file changed, 1 deletion(-)
Quoted 13 lines
Quoted 11 lines
scripts/update-linux-headers.sh +0 -0
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755
@@ -154,7 +154,6 @@ EOF

      mkdir -p "$output/include/standard-headers/asm-$arch"
      if [ $arch = s390 ]; then
          cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/" -        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
          cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
      fi

I think it would make sense to remove linux-headers/asm-s390/unistd_32.h in this patch, too, otherwise this will stay around as a stale file, I guess?

AFAICT, it will be removed at the first update of linux-headers. See :

https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 2 lines

Anyway,

Thanks,

C.

Reviewed-by
#3 lore raw
Quoted 31 lines · Cédric Le Goater
Quoted 16 lines · Thomas Huth
Quoted 15 lines · Cédric Le Goater

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
  scripts/update-linux-headers.sh | 1 -

  1 file changed, 1 deletion(-)
Quoted 13 lines
Quoted 11 lines
scripts/update-linux-headers.sh +0 -0
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755
@@ -154,7 +154,6 @@ EOF

      mkdir -p "$output/include/standard-headers/asm-$arch"
      if [ $arch = s390 ]; then
          cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/" -        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
          cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
      fi

I think it would make sense to remove linux-headers/asm-s390/unistd_32.h in this patch, too, otherwise this will stay around as a stale file, I guess?

Quoted 3 lines

AFAICT, it will be removed at the first update of linux-headers. See :

   https://lore.kernel.org/qemu-devel/[email protected]/

Yes, the script purges the old files before installing the new versions.

Quoted 6 lines
Quoted 3 lines

Anyway,

Thanks,

C.

#4 lore raw
In reply to Cédric Le Goater
Quoted 32 lines · Cédric Le Goater
Quoted 16 lines · Thomas Huth
Quoted 15 lines · Cédric Le Goater

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
  scripts/update-linux-headers.sh | 1 -

  1 file changed, 1 deletion(-)
Quoted 14 lines
Quoted 5 lines
scripts/update-linux-headers.sh +0 -0
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755
@@ -154,7 +154,6 @@ EOF
Quoted 7 lines

      mkdir -p "$output/include/standard-headers/asm-$arch"
      if [ $arch = s390 ]; then
          cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/ include/standard-headers/asm-s390/" -        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-
s390/"
          cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/ asm-s390/"
      fi

I think it would make sense to remove linux-headers/asm-s390/unistd_32.h in this patch, too, otherwise this will stay around as a stale file, I guess?

Quoted 4 lines

AFAICT, it will be removed at the first update of linux-headers. See :

  https://lore.kernel.org/qemu-devel/20251222135357.143339-2-
[email protected]/

Ah, perfect, that's fine, too!

Thomas

Quoted 7 lines
Quoted 3 lines

Anyway,

Thanks,

C.

author Applied
#5 lore raw
In reply to Cédric Le Goater
Quoted 20 lines · Cédric Le Goater

The "asm/unistd_32.h" file was generated for the 31-bit compatibility mode on the s390 architecture and support was removed in v6.19-rc1, commit 4ac286c4a8d9 ("s390/syscalls: Switch to generic system call table generation")

unistd_32.h is no longer generated when running make header_install. Remove it.

---
  scripts/update-linux-headers.sh | 1 -
  1 file changed, 1 deletion(-)
scripts/update-linux-headers.sh +0 -0
index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755

scripts/update-linux-headers.sh EOF · line 159

Quoted 7 lines
scripts/update-linux-headers.sh +0 -1
@@ -154,7 +154,6 @@ EOF
      mkdir -p "$output/include/standard-headers/asm-$arch"
      if [ $arch = s390 ]; then
          cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
-        cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
          cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
      fi
      if [ $arch = arm64 ]; then

Applied to vfio-next.

Thanks,

C.