From nobody Tue Sep 29 11:19:37 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 E61883370EC; Sat, 8 Aug 2026 09:39:25 +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=1786181967; cv=none; b=ZuLtTSdER8J1UMbblvbplVW2WVjb8BzJYz9UZF4khmZGCBglXjKLxLE8ROq1XdcV2VsTXadXtXoMmxtMUO72K5XGor51f2SN1oxYd4ALTQqeRaM8n1DY1zMj5KFIa8KVdjv4Ucj/DC/PB9CzM6gMpOJW/qGsnDscmiC1y08BWxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786181967; c=relaxed/simple; bh=N8t2JaW6RkGWHRwx0MIyJcVQDMwifeNwtrA1tSOWFzI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Ax1BzzKV8sHc2n01KnHLUA+JMcGCqDmEVIKDvcuJUTSWyXyX02OSBRU51/doRCP2RozdnmhjP6muuldorUGAfxDHDlMA/d7H1TMveMQYniHRmp4cz10LeaWt73cs5Ynpx+us/u+Illo7Wj2VTVlHyi1CivIj5vrZnBhuM40rAOM= 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=bHgDTP5f; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zArWRU6j; 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="bHgDTP5f"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zArWRU6j" Date: Sat, 08 Aug 2026 09:39:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1786181963; 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=6VN9WpNpV6BgQalvD9qE6PQ2tOV4spid+6MOnXMHNvI=; b=bHgDTP5fcLOGfCqCwNTGyc94l3JbHjHJ2Z2uXfLk2tkWRcVUo1uGctie2zsfKjh6skbm0k 0kUW072rUSr0qc2GO4qzyClniiKgIa0P4ukS83QJ84UAl5R0vPAac4cVJ5x5gqDjKAh1bl 7XAbjhaWd8r9vRnXwAmv1winHZFidm9xPmdiktLlk2YeelLVe2DrY/JbHbDuZd1krdzsmn 0/jkOooSCbVCu6F9DWcZtn+CsbMTJ3LXREnYHh5Jjg6JQOuTUA/3X6lhsUNvp7K5AZbVEz znqo9l+wnFK1YKvlp980hJmpEe+NsV5vOOuNyGCLU8ymfZgYpd9/t31rjUCLdQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1786181963; 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=6VN9WpNpV6BgQalvD9qE6PQ2tOV4spid+6MOnXMHNvI=; b=zArWRU6jbMRUcZj+7LDbMUs5+7N14GAgIPTke4hshFvAtGz/8LO2UrNUz3GVZe/Z7Lm530 1tXWAQmx8JRGiPBA== 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: objtool/core] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Cc: Thomas Huth , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260619155733.58852-1-thuth@redhat.com> References: <20260619155733.58852-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: <178618196190.442315.12255422501918242862.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 objtool/core branch of tip: Commit-ID: 6e5716b187faf50e5d33f0986ea25827cbdaa294 Gitweb: https://git.kernel.org/tip/6e5716b187faf50e5d33f0986ea25827c= bdaa294 Author: Thomas Huth AuthorDate: Fri, 19 Jun 2026 17:57:33 +02:00 Committer: Peter Zijlstra CommitterDate: Fri, 07 Aug 2026 18:27:18 +02:00 objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files 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/20260619155733.58852-1-thuth@redhat.com --- include/linux/objtool.h | 8 ++++---- include/linux/objtool_types.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 9a00e70..af2e68e 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -7,7 +7,7 @@ =20 #ifdef CONFIG_OBJTOOL =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define UNWIND_HINT(type, sp_reg, sp_offset, signal) \ "987: \n\t" \ @@ -53,7 +53,7 @@ =20 #define __ASM_BREF(label) label ## b =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 /* * In asm, there are two kinds of code: normal C-type callable functions a= nd @@ -102,11 +102,11 @@ #endif .endm =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #else /* !CONFIG_OBJTOOL */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t" #define STACK_FRAME_NON_STANDARD(func) diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h index c6def40..c24e9ea 100644 --- a/include/linux/objtool_types.h +++ b/include/linux/objtool_types.h @@ -2,7 +2,7 @@ #ifndef _LINUX_OBJTOOL_TYPES_H #define _LINUX_OBJTOOL_TYPES_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -18,7 +18,7 @@ struct unwind_hint { u8 signal; }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can resu= lt in