Re: [PATCH] update-linux-headers: Remove "asm-s390/unistd_32.h"

[Cornelia Huck <cohuck@redhat.com>]

On Mon, Jan 12 2026, Cédric Le Goater <clg@redhat.com> wrote:

> On 1/12/26 17:07, Thomas Huth wrote:
>> On 12/01/2026 16.53, Cédric Le Goater wrote:
>>> 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.
>>>
>>> Reported-by: Shameer Kolothum <skolothumtho@nvidia.com>
>>> Cc: Thomas Huth <thuth@redhat.com>
>>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>>> ---
>>>   scripts/update-linux-headers.sh | 1 -
>>>   1 file changed, 1 deletion(-)
>>>
>>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>>> index 844d9cb9f5e430dcb4833e6225b57173f4befb8c..d09d8cf4c6f0f6a109e899f5c8671f64373d9c6a 100755
>>> --- a/scripts/update-linux-headers.sh
>>> +++ b/scripts/update-linux-headers.sh
>>> @@ -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/20251222135357.143339-2-skolothumtho@nvidia.com/

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

>
>> Anyway,
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Thanks,
>
> C.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>