From nobody Wed Jun 17 01:33:45 2026 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 9EE0D13C9C4 for ; Tue, 21 Apr 2026 11:30:22 +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=1776771024; cv=none; b=iq5OFBeOZfR9bLNwd55z3e6D2lxAeD+tXeqXEzbCoQsErUEnuAqui+SDOhT7sJ2LNeZBY7xuThaIrdGBDTz81VYkODVmZqNOdpLO6Vg4BAuX1JIZWt0PlAWtQS/rqwEPYXlFQdkTTymznQIyQAlT3LhyN3472Macyl7QzEHIK0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776771024; c=relaxed/simple; bh=lEczPc0krCfylufnGGBNCrrOzS17CGhPbFCnjYRhxwM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CorDVf+tMOvh1kcuEkwx8vj4f41UQbGwfA/enSHHG85I46FRD7kmO8E7Od44eZVKUHmCXOGjmjzrBzAttWUi4jLvKaRbLkQ83dsjTTaqjVTafJD/QJacJleDny3EaXFfmL4Hh/vSpcTgPYdO7ocKNUzCHtFuKGqt53Ds/gA4CAg= 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=bK3JuaNU; 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="bK3JuaNU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776771021; 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=jPjnZBfP1z/pXHiEqouMeuwtbWPnoWSvPWYO1xCNVEw=; b=bK3JuaNUAZHpqvoR1IvhCfbUZUid8V7aqEBwSqX56+aJrpVM2Sj/Stvn8Hsrd1MKFI8Xuk zaHJbYFVlwzJfcRqDY2Xh2+cMuu3lw+QbDHnrVcTdL2bYsDemxu0va4+ZsYQTbp8EwEVXc 1lYA3VWEL8Q2qwOqg8bdSblXDp3KOio= Received: from mx-prod-mc-03.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-474-PatFLygDOaOEH02LjEqflw-1; Tue, 21 Apr 2026 07:30:18 -0400 X-MC-Unique: PatFLygDOaOEH02LjEqflw-1 X-Mimecast-MFC-AGG-ID: PatFLygDOaOEH02LjEqflw_1776771017 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA96B195606F; Tue, 21 Apr 2026 11:30:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.49.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1A49C1956095; Tue, 21 Apr 2026 11:30:13 +0000 (UTC) From: Thomas Huth To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] irqchip/gic: Replace __ASSEMBLY__ with __ASSEMBLER__ Date: Tue, 21 Apr 2026 13:30:12 +0200 Message-ID: <20260421113012.146528-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.17 Content-Type: text/plain; charset="utf-8" From: Thomas Huth While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembly code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This can be very confusing when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's standardize now on the __ASSEMBLER__ macro that is provided by the compilers. Signed-off-by: Thomas Huth --- Note: Patch has been split from an earlier patch series of mine to ease reviewing arch/arm/include/asm/arch_gicv3.h | 4 ++-- include/linux/irqchip/arm-gic-v3.h | 2 +- include/linux/irqchip/arm-gic.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_= gicv3.h index 311e83038bdb3..847590df75511 100644 --- a/arch/arm/include/asm/arch_gicv3.h +++ b/arch/arm/include/asm/arch_gicv3.h @@ -7,7 +7,7 @@ #ifndef __ASM_ARCH_GICV3_H #define __ASM_ARCH_GICV3_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -257,5 +257,5 @@ static inline bool gic_has_relaxed_pmr_sync(void) return false; } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* !__ASM_ARCH_GICV3_H */ diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm= -gic-v3.h index 0225121f30138..ea5fd2374ebe0 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -604,7 +604,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * We need a value to serve as a irq-type for LPIs. Choose one that will diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gi= c.h index d45fa19f9e470..849386dc5ec80 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -131,7 +131,7 @@ #define GICV_PMR_PRIORITY_SHIFT 3 #define GICV_PMR_PRIORITY_MASK (0x1f << GICV_PMR_PRIORITY_SHIFT) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -162,5 +162,5 @@ int gic_get_cpu_id(unsigned int cpu); void gic_migrate_target(unsigned int new_cpu_id); unsigned long gic_get_sgir_physaddr(void); =20 -#endif /* __ASSEMBLY */ +#endif /* __ASSEMBLER__ */ #endif --=20 2.53.0