From nobody Tue Jun 16 17:03:59 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 A60E626FDBF; Thu, 30 Apr 2026 10:56:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777546604; cv=none; b=Ho4JIVAj6+brYNjW57hbpqUwalQo1AWMt6ZzZpfH62q2TCytGrJ1nrEJtyjD5VFvr0RpPORQo/fUoG5BhgCC6I6XiQ38bXd2pprSeE8xTvELT29y18eOv6pxBKYfunQvUU+P2RKFHMAFhzrk93wEf2EDlL2zhYV/OxHCEMeeaJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777546604; c=relaxed/simple; bh=9yeB+1pb+L1kNVnu+UP7qg9bKqGOEYpBJiyJPjcleS8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=E7gzItINNg2JSMuQQPPzFIFXRPD9y9eiKllzCEqr4kojXTl5Ry5hOlcDJq01Br5xw2LUZayy2wRKT3QuWadBm2mhwCjk3NLDFm2Eq8K5KUyrOrkkMwDBFoCHSDrQC2hDZW0ZxbqMl2yDlDW2dfWQTBARUaJhIfgDYj4Pkudr8xk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=h79V3c6U; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=X8rY5ZGH; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="h79V3c6U"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="X8rY5ZGH" Date: Thu, 30 Apr 2026 10:56:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777546600; h=from:from:sender:sender:reply-to: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; bh=ax1b37DiG3fXkEadVwymScb8gFmSwLGZl35/+Ym7QXo=; b=h79V3c6U8K4J3OMcCAG6iRbebnCIePQ+WJSxes3QIYNcWNp3nhKHqQF2p3jenaHunXLwnC X9KkgKGPrgGL+WjzFmvPqxhEqjtDgEcybOhoVd6olTj/nAxU4p9j8F3SiF+vVXY3PWJsF7 gUeqSE9vY4CFQk2XwOaD12xTMRW/LLbkonNGTDf6XCMZBgNDcwZna9Rv/9eiHjvLftKPP2 BpML7Uk0T/mpKY8HA78//E9jUjiU/JL07cSKufGgR7XYUkrkL4OKUhlZZG3Xe4pAIYQLFN /0rLEEeA173597vfJG69AwB3l2RCycSuZ7XaAuQP9rk/+sOG7wbDvaPChcEM8w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777546600; h=from:from:sender:sender:reply-to: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; bh=ax1b37DiG3fXkEadVwymScb8gFmSwLGZl35/+Ym7QXo=; b=X8rY5ZGH56k//5jO8N7YgGQfquNYC5T4aBUuGBRHLtdtrpzujFQITKltT5HqZlsvo6ZHlm PWQ8BkKPMvA2HrDg== From: "tip-bot2 for Thomas Huth" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/drivers] irqchip/gic: Replace __ASSEMBLY__ with __ASSEMBLER__ Cc: Thomas Huth , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260421113012.146528-1-thuth@redhat.com> References: <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 Message-ID: <177754659952.3521451.15393185063668568336.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/drivers branch of tip: Commit-ID: 5a59e82f95d3521fa64f24b6450417ee098d8546 Gitweb: https://git.kernel.org/tip/5a59e82f95d3521fa64f24b6450417ee0= 98d8546 Author: Thomas Huth AuthorDate: Tue, 21 Apr 2026 13:30:12 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 30 Apr 2026 12:53:06 +02:00 irqchip/gic: Replace __ASSEMBLY__ with __ASSEMBLER__ 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. Standardize now on the __ASSEMBLER__ macro that is provided by the compilers. Signed-off-by: Thomas Huth Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260421113012.146528-1-thuth@redhat.com --- 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 311e830..847590d 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 0225121..ea5fd23 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 d45fa19..849386d 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