From nobody Fri Oct 2 09:26:35 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 044833B059D; Mon, 3 Aug 2026 08:09:59 +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=1785744601; cv=none; b=hCU/DG8xOdy99paSmgkTy13ezb8G8jsuAKvQ64cIAcOYp4n62NhLep+OG/rWYAawAKTc27DB0DWCqA7aEikknOP+AxxKAZDPMgB/o2vjJa+5WA4VOzEsqjmiTZIai7pLhiwTSuI5bJOo/nYL+CWw4DZGY5N9X9zzb1gu465rvps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785744601; c=relaxed/simple; bh=ozEngqr0/pxGuGyyRHMucAPEximrAZ4/uvaspwfQI+Y=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=giPFNr0oSkz3722YP8zEIQNWys756VLXHSuBiGCxzsTKIA4eCq0KYo8WsSPjZGJMARFn8AQPIqpxfo5wqxNOo5um2/aS7lyUHOuFVtbOIHJX76fqG9h7rjBvp45g+tmNrfizQkir2VPG46DPawYt8+zl56IEWetJ9C86hfLj6Zw= 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=RD575yt9; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QWL9Q+oO; 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="RD575yt9"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QWL9Q+oO" Date: Mon, 03 Aug 2026 08:09:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1785744591; 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=kM4HdcdWgylE6z5Cp9f1R0p2zYMSXnhiWxWsCrYjfvE=; b=RD575yt94Y/IFei2WzOtE3HwA6N7enJ3c7dMp9XX350M75NphclPRNYaoDsHGuh51K+IOk nYzSsoyisV9k0/3FCEMxFmGjps5hoYphTBA6Y9TGwMJej3AzqpECUN0EWf5e1KqFSYwNo/ 6D0vT3WZnrWoJ532fiEbh6Pwb1/8jjMt6HenpAnACAwXC0dYu5ByXpva9ZomCQb+SC7PU0 mFN/j7CCzXfQG3jEGXm1N7VSDfATS/VAjv2EKP5CrlcibQnz6gtg2cp+17QShbNKbTENrQ r1yeCwC+0DzB16w05C1HbvkY8+lmPaFZGKb2AY/Jz7PXGxeENmhQmWQXG2EVYA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1785744591; 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=kM4HdcdWgylE6z5Cp9f1R0p2zYMSXnhiWxWsCrYjfvE=; b=QWL9Q+oOuyGrbAETi2DEFBAD1fG8esBG32heAmU+iORoqIl61BpUdFmK/BEtebAZ923OJs kA+Qz9n0hjfPjWCg== 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: locking/core] static_call / jump_label: Replace __ASSEMBLY__ with __ASSEMBLER__ in headers Cc: Thomas Huth , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260619124936.208519-1-thuth@redhat.com> References: <20260619124936.208519-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: <178574459027.1210945.12911441014179033166.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 locking/core branch of tip: Commit-ID: 6cb423c96e842248ac4131ae0a25f0a50cef2776 Gitweb: https://git.kernel.org/tip/6cb423c96e842248ac4131ae0a25f0a50= cef2776 Author: Thomas Huth AuthorDate: Fri, 19 Jun 2026 14:49:36 +02:00 Committer: Peter Zijlstra CommitterDate: Fri, 31 Jul 2026 10:32:24 +02:00 static_call / jump_label: Replace __ASSEMBLY__ with __ASSEMBLER__ in headers 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. This is a completely mechanical patch (done with a simple "sed -i" statement). Signed-off-by: Thomas Huth Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260619124936.208519-1-thuth@redhat.com --- arch/arm/include/asm/jump_label.h | 4 ++-- include/linux/jump_label.h | 10 +++++----- include/linux/static_call_types.h | 4 ++-- tools/include/linux/static_call_types.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_= label.h index a35aba7..11024b7 100644 --- a/arch/arm/include/asm/jump_label.h +++ b/arch/arm/include/asm/jump_label.h @@ -2,7 +2,7 @@ #ifndef _ASM_ARM_JUMP_LABEL_H #define _ASM_ARM_JUMP_LABEL_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -49,5 +49,5 @@ struct jump_entry { jump_label_t key; }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index b9c7b0e..c95350a 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -71,7 +71,7 @@ * Additional babbling in: Documentation/staging/static-keys.rst */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -100,12 +100,12 @@ struct static_key { #endif /* CONFIG_JUMP_LABEL */ }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #ifdef CONFIG_JUMP_LABEL #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE =20 struct jump_entry { @@ -180,7 +180,7 @@ static inline int jump_entry_size(struct jump_entry *en= try) #endif #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 enum jump_label_type { JUMP_LABEL_NOP =3D 0, @@ -524,6 +524,6 @@ extern bool ____wrong_branch_error(void); #define static_branch_enable_cpuslocked(x) static_key_enable_cpuslocked(&(= x)->key) #define static_branch_disable_cpuslocked(x) static_key_disable_cpuslocked(= &(x)->key) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _LINUX_JUMP_LABEL_H */ diff --git a/include/linux/static_call_types.h b/include/linux/static_call_= types.h index cfb6dde..ac55bc9 100644 --- a/include/linux/static_call_types.h +++ b/include/linux/static_call_types.h @@ -25,7 +25,7 @@ #define STATIC_CALL_SITE_INIT 2UL /* init section */ #define STATIC_CALL_SITE_FLAGS 3UL =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * The static call site table needs to be created by external tooling (obj= tool @@ -102,6 +102,6 @@ struct static_call_key { =20 #endif /* CONFIG_HAVE_STATIC_CALL */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _STATIC_CALL_TYPES_H */ diff --git a/tools/include/linux/static_call_types.h b/tools/include/linux/= static_call_types.h index cfb6dde..ac55bc9 100644 --- a/tools/include/linux/static_call_types.h +++ b/tools/include/linux/static_call_types.h @@ -25,7 +25,7 @@ #define STATIC_CALL_SITE_INIT 2UL /* init section */ #define STATIC_CALL_SITE_FLAGS 3UL =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * The static call site table needs to be created by external tooling (obj= tool @@ -102,6 +102,6 @@ struct static_call_key { =20 #endif /* CONFIG_HAVE_STATIC_CALL */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _STATIC_CALL_TYPES_H */