x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

[PATCH QEMU] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

Posted by Alexey Kardashevskiy 7 months, 3 weeks ago

The recent kernel update 8a141be3233af7d broke the headers update,
fix it in the script.

Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@amd.com>
---

Or we want both __ASSEMBLY__ and __ASSEMBLER__?

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8a141be3233af7d
---
 scripts/update-linux-headers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 8913e4fb99b..b43b8ef75a6 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -177,7 +177,7 @@ EOF
 
         # Remove everything except the macros from bootparam.h avoiding the
         # unnecessary import of several video/ist/etc headers
-        sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \
+        sed -e '/__ASSEMBLER__/,/__ASSEMBLER__/d' \
                "$hdrdir/include/asm/bootparam.h" > "$hdrdir/bootparam.h"
         cp_portable "$hdrdir/bootparam.h" \
                     "$output/include/standard-headers/asm-$arch"
-- 
2.49.0

Re: [PATCH QEMU] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

Posted by Thomas Huth 7 months, 3 weeks ago

On 29/04/2025 02.17, Alexey Kardashevskiy wrote:
> The recent kernel update 8a141be3233af7d broke the headers update,
> fix it in the script.

Thanks, but the same patch is already on the list:

https://lore.kernel.org/qemu-devel/20250425052401.8287-2-rreyes@linux.ibm.com/

> Or we want both __ASSEMBLY__ and __ASSEMBLER__?

It's about one x86 header, and for x86, all macros got changed, so I think 
we don't need to check for both here.

  Thomas


> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8a141be3233af7d
> ---
>   scripts/update-linux-headers.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 8913e4fb99b..b43b8ef75a6 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -177,7 +177,7 @@ EOF
>   
>           # Remove everything except the macros from bootparam.h avoiding the
>           # unnecessary import of several video/ist/etc headers
> -        sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \
> +        sed -e '/__ASSEMBLER__/,/__ASSEMBLER__/d' \
>                  "$hdrdir/include/asm/bootparam.h" > "$hdrdir/bootparam.h"
>           cp_portable "$hdrdir/bootparam.h" \
>                       "$output/include/standard-headers/asm-$arch"

Re: [PATCH QEMU] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

Posted by Cédric Le Goater 7 months, 3 weeks ago

On 4/29/25 07:22, Thomas Huth wrote:
> On 29/04/2025 02.17, Alexey Kardashevskiy wrote:
>> The recent kernel update 8a141be3233af7d broke the headers update,
>> fix it in the script.
> 
> Thanks, but the same patch is already on the list:
> 
> https://lore.kernel.org/qemu-devel/20250425052401.8287-2-rreyes@linux.ibm.com/

yeah. I grabbed the whole series which includes a linux-headers update
in vfio-next. I plan to send a PR in a couple of weeks.


Thanks,

C.

Re: [PATCH QEMU] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

Posted by Rorie Reyes 7 months, 3 weeks ago

On 4/29/25 3:30 AM, Cédric Le Goater wrote:

> On 4/29/25 07:22, Thomas Huth wrote:
>> On 29/04/2025 02.17, Alexey Kardashevskiy wrote:
>>> The recent kernel update 8a141be3233af7d broke the headers update,
>>> fix it in the script.
>>
>> Thanks, but the same patch is already on the list:
>>
>> https://lore.kernel.org/qemu-devel/20250425052401.8287-2-rreyes@linux.ibm.com/ 
>>
>
> yeah. I grabbed the whole series which includes a linux-headers update
> in vfio-next. I plan to send a PR in a couple of weeks.
>
>
> Thanks,
>
> C.
>
Is there anything on my end that you need from me?