Skip to contentSkip to conversation

x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

PATCH In review Alexey Kardashevskiy 4 participants 4 messages Apr 29, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers

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

---

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(-)
scripts/update-linux-headers.sh +1 -1
index 8913e4fb99b..b43b8ef75a6 100755
@@ -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"
Signature · 1 line
2.49.0
#1 lore raw
Quoted 2 lines · Alexey Kardashevskiy

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/[email protected]/

Quoted 1 line

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

Quoted 18 lines

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(-)
scripts/update-linux-headers.sh +1 -1
index 8913e4fb99b..b43b8ef75a6 100755
@@ -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 lore raw
Quoted 7 lines · Thomas Huth
Quoted 2 lines · Alexey Kardashevskiy

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/[email protected]/

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.

#3 lore raw
Quoted 10 lines · Cédric Le Goater
Quoted 8 lines · Thomas Huth
Quoted 2 lines · Alexey Kardashevskiy

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/[email protected]/

Quoted 8 lines

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?