From nobody Sun Feb 8 04:11:25 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 918D522F77E for ; Thu, 18 Dec 2025 18:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766082074; cv=none; b=Ax33rQFU07mhgX21hZkmXa7NzrNbUXoJtiddvejjIQRrAwKo+44W+ndME22/G+A6ldjLHPxcqmPnlRO//rwKv4XbQJ5jC6AzkpDqgOq7jZNv5K9UsCG03jmI0Eo1DVGgZkc7iVjlPuncSp+6GyN5kWd3cLwWj+H3M6kkZGVMsyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766082074; c=relaxed/simple; bh=spqucCpIhnvB8Wx1MP5JIEwFHzOQLfY7cHJEtzoGX58=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=j32essOFH5eCf1Sc+8qXDwO9YfAe8tZkGWv9EBW63E1mcZn5q9Y0EN8TXgnFC4b3u+LCN2DkF/2nEDlmCdliF6kf6EmvjZLTqjGcCbC3gZpYc1NOxKUs1GtLXeO1qvEpTt56GSEpnffdhvqe2deRwnqmYbTwr0Q7oo3CQrM1uf0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XujYGNfn; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XujYGNfn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766082071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LEOEhinEOx39kSuZYCSSaLY7tD3GPX1MLq+QEicIv9E=; b=XujYGNfnZAPSbJOsWvtx8KA4z7Gv5waGoQ8k9nqNJ2oqwVf5s3q3Y/t8c47GQeC38BTJY0 p6jkJymuyWw7v+kmXKFuTrhLLo401z5/VS6SBuAmOz+ghlAc/7MBFrZLazwmxnIpxl3jim FuQhq9MBI+YgghHMu1cEg/Gy+Zb8TaI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-UcDV-0yQPXWChoqA2xjIPw-1; Thu, 18 Dec 2025 13:20:38 -0500 X-MC-Unique: UcDV-0yQPXWChoqA2xjIPw-1 X-Mimecast-MFC-AGG-ID: UcDV-0yQPXWChoqA2xjIPw_1766082037 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F65C195DE48; Thu, 18 Dec 2025 18:20:36 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.147]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B0F5019560B4; Thu, 18 Dec 2025 18:20:31 +0000 (UTC) From: Thomas Huth To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , linux-kernel@vger.kernel.org Subject: [PATCH v5] x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__ Date: Thu, 18 Dec 2025 19:20:29 +0100 Message-ID: <20251218182029.166993-1-thuth@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth After converting the __ASSEMBLY__ statements to __ASSEMBLER__ in commit 24a295e4ef1ca ("x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers"), some new code has been added that uses __ASSEMBLY__ again. Convert these stragglers, too. This is a mechanical patch, done with a simple "sed -i" command. Signed-off-by: Thomas Huth --- v5: Fix new occurances in bug.h arch/x86/include/asm/bug.h | 6 +++--- arch/x86/include/asm/irqflags.h | 4 ++-- arch/x86/include/asm/percpu.h | 2 +- arch/x86/include/asm/runtime-const.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index d561a8443c137..e9987061598b3 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -7,7 +7,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct bug_entry; extern void __WARN_trap(struct bug_entry *bug, ...); #endif @@ -137,7 +137,7 @@ do { \ =20 #ifdef HAVE_ARCH_BUG_FORMAT_ARGS =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include DECLARE_STATIC_CALL(WARN_trap, __WARN_trap); =20 @@ -153,7 +153,7 @@ struct arch_va_list { struct sysv_va_list args; }; extern void *__warn_args(struct arch_va_list *args, struct pt_regs *regs); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #define __WARN_bug_entry(flags, format) ({ \ struct bug_entry *bug; \ diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflag= s.h index b30e5474c18e1..5feaac1d235f0 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -77,7 +77,7 @@ static __always_inline void native_local_irq_restore(unsi= gned long flags) #endif =20 #ifndef CONFIG_PARAVIRT -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Used in the idle loop; sti takes one instruction cycle * to complete: @@ -95,7 +95,7 @@ static __always_inline void halt(void) { native_halt(); } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONFIG_PARAVIRT */ =20 #ifdef CONFIG_PARAVIRT_XXL diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 725d0eff7acdf..50f73a8df7f6c 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -20,7 +20,7 @@ =20 #define PER_CPU_VAR(var) __percpu(var)__percpu_rel =20 -#else /* !__ASSEMBLY__: */ +#else /* !__ASSEMBLER__: */ =20 #include #include diff --git a/arch/x86/include/asm/runtime-const.h b/arch/x86/include/asm/ru= ntime-const.h index e5a13dc8816e2..4cd94fdcb45e2 100644 --- a/arch/x86/include/asm/runtime-const.h +++ b/arch/x86/include/asm/runtime-const.h @@ -6,7 +6,7 @@ #error "Cannot use runtime-const infrastructure from modules" #endif =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ =20 .macro RUNTIME_CONST_PTR sym reg movq $0x0123456789abcdef, %\reg @@ -16,7 +16,7 @@ .popsection .endm =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 #define runtime_const_ptr(sym) ({ \ typeof(sym) __ret; \ @@ -74,5 +74,5 @@ static inline void runtime_const_fixup(void (*fn)(void *,= unsigned long), } } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif --=20 2.52.0