From nobody Thu Apr 9 10:30:35 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 659AE3DA7FD; Mon, 9 Mar 2026 15:58:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773071899; cv=none; b=VC2VUXuGm5a5dhXti2QDGzzGnjF41kZnJDu5JTd8Ev4GFsqYuf8Nyz0+2gs5iNVd06OJzy/Aw16ZRLWINNjiYPTUyhTh+dwId7zEdBYyXrNqn9ixDumaiyFSpKrO1ROzT2kixb9VXRCp8/pZzcd/gh2Tfw4cXLQbieRm4QItKBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773071899; c=relaxed/simple; bh=U+5smVL/wbYmKd9t1E5k7w/AHjE+U7oHani9WoutarY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=IEQ1077zZAK9iA4wk+dxFM6ewHoX3b1QxY+B454y0/4GKtt26MCKDE54ePIjeTGrPS1sIoq8o382Rbub2EdOnxdBanolDZVb56jEw9en5vzkHSxq9JwlaEX1Jdowu5LcRBOk+cHxAhqd7x6leA7YTaANQhAgCZqUpEtbHG63vSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=AXcToXOu; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="AXcToXOu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1773071894; bh=U+5smVL/wbYmKd9t1E5k7w/AHjE+U7oHani9WoutarY=; h=From:Date:Subject:To:Cc:From; b=AXcToXOu9A7lCngPqjBEcdKfk3qH20nGxwnqdeccZU0BYRqlyZNoVFvsbD6HMs9S3 ynf/SbgDXpFFbKB3AfqQly1XAHSoYiLgFp/2fg6GAFkid6rU36op4BFNJs1r3is78/ i6OMEoanC5HafGFeULlnsOZtAYsTd+p1rsF97IOk= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Mon, 09 Mar 2026 16:58:11 +0100 Subject: [PATCH] scripts: headers_install.sh: Normalize __ASSEMBLY__ to __ASSEMBLER__ Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260309-uapi-assembly-v1-1-a7ebfbf14309@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDYwMj3dLEgkzdxOLi1NyknEpdg6QkcyND4yQTwzRDJaCegqLUtMwKsHn RsbW1ANrPph5fAAAA X-Change-ID: 20260302-uapi-assembly-0bb7213b41f1 To: Arnd Bergmann , Nathan Chancellor , Nicolas Schier Cc: "Maciej W. Rozycki" , Nick Huang , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773071894; l=1831; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=U+5smVL/wbYmKd9t1E5k7w/AHjE+U7oHani9WoutarY=; b=RisQhd4P8Zxn/1OzLNbDuXV43bksvz56GYITP5nh4iWVpX6gDmUANgcV+PM4BZos1tSzlGxJA /xTSfLfW68LDSnS+SSZwXt8neZgWX7b+DX+/za3j0mCANQJig946PJi X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= There is an ongoing effort to replace the usage of __ASSEMBLER__ with __ASSEMBLY__ throughout the kernel tree, see for example commit 287d163322b7 ("arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers"). The latter is automatically provided by all compilers and preprocessors supported by the kernel, so the explicit definitions of __ASSEMBLER__ can be removed. However the UAPI headers might be used with older (< GCC 3.0) or non-GCC-compatible compilers, which do not define __ASSEMBLY__ automatically. So this migration may brake users. Also during the migration phase, the UAPI headers will use a mix of *both* __ASSEMBLY__ and __ASSEMBLER__ at the same time, which is ugly. For now make sure that the exported UAPI headers consistently use __ASSEMBLER__ as before. Link: https://lore.kernel.org/lkml/164baf81-2824-4943-bbc1-4ae8a160c0cc@t-8= ch.de/ Signed-off-by: Thomas Wei=C3=9Fschuh --- This should go either through kbuild or asm-generic, I think. --- scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh index 9c15e748761c..2f1d1767ca26 100755 --- a/scripts/headers_install.sh +++ b/scripts/headers_install.sh @@ -36,6 +36,7 @@ sed -E -e ' s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ + s/__ASSEMBLY__/__ASSEMBLER__/g ' $INFILE > $TMPFILE || exit 1 =20 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE --- base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f change-id: 20260302-uapi-assembly-0bb7213b41f1 Best regards, --=20 Thomas Wei=C3=9Fschuh