From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.avm.de (mail.avm.de [212.42.244.120]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0BF637BE93; Mon, 13 Jul 2026 12:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.42.244.120 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783947424; cv=none; b=I8QwI1J6FErbHBU0cMUGUbFEjSFab42KLUd9CnHeYstaan8XCmC0rtEEZY/cS/AQV294U7bh2MZA3eltQHBlwtLzb5rcgcLWvRSm5au1ZV42bVmkFT8enOBSFpeEMEn7kzF+dK36wHn6UPWdTE676EPeHTB5/C8ngTxqDXq07+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783947424; c=relaxed/simple; bh=bIRqCHpriQsXZf5XV0nkylnIIJScooWgklVhK7I/yP8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=WKoJNbZPIBORYiRaW38NFdzVVoIw4kCk1qpCfsF0siUw/7v8QT/eeNcyq6PU3O8C/+QDdG1QgPKVZS+IhPh5Zwdh0ysGLAIh3SX4yBStjF4SDlxn6uRyjythz/WKmFfIA2DS8lItVtvITbUTLGtoYk95XkZUhUTwdGHhcHEGeM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fritz.com; spf=pass smtp.mailfrom=fritz.com; arc=none smtp.client-ip=212.42.244.120 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fritz.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fritz.com Received: from [2001:bf0:244:244::78] (helo=mail.avm.de) by mail.avm.de with ESMTP (eXpurgate 4.57.1) (envelope-from ) id 6a54e095-7cb1-7f0000032729-7f0000018c44-1 for ; Mon, 13 Jul 2026 14:56:53 +0200 Received: from mail-auth.fritz.com (unknown [IPv6:2001:bf0:244:244::78]) by mail.avm.de (Postfix) with ESMTPS; Mon, 13 Jul 2026 14:56:53 +0200 (CEST) Date: Mon, 13 Jul 2026 14:56:52 +0200 From: Nicolas Schier To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= Cc: Arnd Bergmann , Nathan Chancellor , Nicolas Schier , "Maciej W. Rozycki" , Nick Huang , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: Re: [PATCH v2] scripts: headers_install.sh: Normalize __ASSEMBLER__ to __ASSEMBLY__ Message-ID: <20260713-authentic-nimble-walrus-d4b40b@l-nschier-z2> References: <20260630-uapi-assembly-v2-1-8e7bee2fe816@weissschuh.net> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260630-uapi-assembly-v2-1-8e7bee2fe816@weissschuh.net> Organization: FRITZ! Technology GmbH x-ms-reactions: disallow X-purgate-ID: 149429::1783947413-74E981B0-ABE2B4B2/0/0 X-purgate-type: clean X-purgate-size: 2368 X-purgate: This mail is considered clean (visit https://www.eleven.de for further information) X-purgate: clean X-pfmilter: queueID: 18055A0349 On Tue, Jun 30, 2026 at 11:15:00PM +0200, Thomas Weißschuh wrote: > There is an ongoing effort to replace the usage of __ASSEMBLY__ with > __ASSEMBLER__ 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 __ASSEMBLY__ can be removed. > > However the UAPI headers might be used with non-GCC-compatible > compilers, which do not define __ASSEMBLER__ automatically. > So this migration may break 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 and inconsistent. > > For now make sure that the exported UAPI headers consistently use > __ASSEMBLY__ as before. > > Link: https://lore.kernel.org/lkml/164baf81-2824-4943-bbc1-4ae8a160c0cc@t-8ch.de/ > Signed-off-by: Thomas Weißschuh > --- > Changes in v2: > - Normalize *to* __ASSEMBLY__. > - Link to v1: https://patch.msgid.link/20260309-uapi-assembly-v1-1-a7ebfbf14309@weissschuh.net > --- > 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..83e447596878 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/__ASSEMBLER__/__ASSEMBLY__/g > ' $INFILE > $TMPFILE || exit 1 > > scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE > > --- > base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482 > change-id: 20260302-uapi-assembly-0bb7213b41f1 > > Best regards, > -- > Thomas Weißschuh > Thanks, I'll take it via kbuild. Please veto, if it shall go through asm-generic instead. Reviewed-by: Nicolas Schier Tested-by: Nicolas Schier Kind regards, Nicolas