From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 1609D22D4DC for ; Thu, 12 Feb 2026 19:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770923545; cv=none; b=syT5R1sdRD4Ahp2sMXElkB2XptbenEi0xwtvvHn/IGj7qjxE7CvqjWZrsu3uAbdNS2qp8lY9Gk4cHDelmopoxLXJd+5RATgEDmRT9IjRxVaO52CTEZfw8ZpOOivClVZpgVPkRDrscTWba8myQOqnDgQ/kiXmc+PBcd1sdMSuVXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770923545; c=relaxed/simple; bh=aqdrhpzAyC/hPPqqk9c5u0LhBMBzBmCGvuFIFznihWU=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=FE3z6Jqd1LQFLlSNBCQ2+X/s0p3WfCVkgFFdh45kqG95l66rfJmsVHZS8GWxdq9/OV6nBoj0bukkBmfzQbLW1DR2rosYpWKRK1IFpeaYbhLfZHDK07Haf9trHNZyKs9hmDnIRnA/J873ePWTYQg5h3vf9VAcpXSUqVjAiU/6Rxk= 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=Oun7kJuT; arc=none smtp.client-ip=170.10.133.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="Oun7kJuT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770923543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=qHEMtLuOpbp3Rk0rYlQ7l4ObpN4wIaPd6/KSjP50xtg=; b=Oun7kJuTb1YBudwEqZI4V49jHV7reWEAkstQw94kI9xC832K/QEGJzlUs6ibA3YrTbVzzI ldBFGva6LwUtC0aG5iekENHbQpJnUcmsRjD6k0/DQSThfl8HHvoUzjkNz39QLwqCnRx7qt ycECgex7IhZTZL+lZ9wsiN5KFx6BhGY= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-f0eXJrRfPd-qjNhbJBlT-Q-1; Thu, 12 Feb 2026 14:12:20 -0500 X-MC-Unique: f0eXJrRfPd-qjNhbJBlT-Q-1 X-Mimecast-MFC-AGG-ID: f0eXJrRfPd-qjNhbJBlT-Q_1770923539 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 586C71800464; Thu, 12 Feb 2026 19:12:18 +0000 (UTC) Received: from [10.45.225.23] (unknown [10.45.225.23]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7EB3A1955D85; Thu, 12 Feb 2026 19:12:13 +0000 (UTC) Message-ID: Date: Thu, 12 Feb 2026 20:12:11 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5] x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__ 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 References: <20251218182029.166993-1-thuth@redhat.com> Content-Language: en-US Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20251218182029.166993-1-thuth@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 On 18/12/2025 19.20, Thomas Huth wrote: > 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 Friendly ping! Thomas > 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 > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > struct bug_entry; > extern void __WARN_trap(struct bug_entry *bug, ...); > #endif > @@ -137,7 +137,7 @@ do { \ > > #ifdef HAVE_ARCH_BUG_FORMAT_ARGS > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > #include > DECLARE_STATIC_CALL(WARN_trap, __WARN_trap); > > @@ -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__ */ > > #define __WARN_bug_entry(flags, format) ({ \ > struct bug_entry *bug; \ > diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.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(unsigned long flags) > #endif > > #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 */ > > #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 @@ > > #define PER_CPU_VAR(var) __percpu(var)__percpu_rel > > -#else /* !__ASSEMBLY__: */ > +#else /* !__ASSEMBLER__: */ > > #include > #include > diff --git a/arch/x86/include/asm/runtime-const.h b/arch/x86/include/asm/runtime-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 > > -#ifdef __ASSEMBLY__ > +#ifdef __ASSEMBLER__ > > .macro RUNTIME_CONST_PTR sym reg > movq $0x0123456789abcdef, %\reg > @@ -16,7 +16,7 @@ > .popsection > .endm > > -#else /* __ASSEMBLY__ */ > +#else /* __ASSEMBLER__ */ > > #define runtime_const_ptr(sym) ({ \ > typeof(sym) __ret; \ > @@ -74,5 +74,5 @@ static inline void runtime_const_fixup(void (*fn)(void *, unsigned long), > } > } > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > #endif