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.129.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 4A2D43B7752 for ; Fri, 19 Jun 2026 15:57:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781884671; cv=none; b=lK4ngCPbV6qjuUWabSFWGOrwwNO2JPAngj9f0OkBWdp/Dr5QaurAcvUC5ob75fnVqhAf2bCWEvaAmBtifZ8lOosL9jLXMZkg19TBjhZ+pIoq9U7YsCS/4hd5XmSxQM8W02YNtd7XYfBeTaWB1YxZ6ET5LW2A/DdO/6GWpEzYQ5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781884671; c=relaxed/simple; bh=fpkrO7PykqaRpifvLVtAMODn4teMAR5bc/iORW4aeNE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hMWRHUo/4hlZyfahz75z5xLbkBNeXoe3k59H9dALGy1Y/9adigYAEW2qydSSHB4rHezqxX4RRgqMUNHagydG8nzJOGJrqbU6ok6aWXD8wzducw4s5MHghOtp9HkY5/6AxqL6sezRa+CXYTAPsqT1KmLKOuRKwhLI/TfygczDxJ0= 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=C9vpRYkQ; arc=none smtp.client-ip=170.10.129.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="C9vpRYkQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781884664; 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=9Qg3+ujD0LFJWn4BRVkaCyDjFWU0xAI+ssZqphKWoA0=; b=C9vpRYkQ74C4C9n3pbK6huQBlP5DC9r0CGNHhPlwyqFWRmRVdCz9t74IIJHZQAesbFieHz +apZtFjuuwmFCVF26bw+dWMn/Pk/zeCxer754UlGaDqamvPB6EPtlM/wjO8ngJvckpL/nn Xx1J5iEXrF3E73daawlwwi3dAbj9b8Y= 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-195-GSXPFWq-MQ-W5hu-EHRTIw-1; Fri, 19 Jun 2026 11:57:42 -0400 X-MC-Unique: GSXPFWq-MQ-W5hu-EHRTIw-1 X-Mimecast-MFC-AGG-ID: GSXPFWq-MQ-W5hu-EHRTIw_1781884661 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 5CA591979071; Fri, 19 Jun 2026 15:57:39 +0000 (UTC) Received: from thuth-p1g4.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A56418005B7; Fri, 19 Jun 2026 15:57:34 +0000 (UTC) From: Thomas Huth To: Josh Poimboeuf , Peter Zijlstra Cc: linux-kernel@vger.kernel.org Subject: [PATCH] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Date: Fri, 19 Jun 2026 17:57:33 +0200 Message-ID: <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 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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. This is a completely mechanical patch (done with a simple "sed -i" statement). Signed-off-by: Thomas Huth --- Note: This patch has been split from an earlier bigger patch of mine to ease reviewing. 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 9a00e701454c5..af2e68e496e5d 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -7,7 +7,7 @@ #ifdef CONFIG_OBJTOOL -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #define UNWIND_HINT(type, sp_reg, sp_offset, signal) \ "987: \n\t" \ @@ -53,7 +53,7 @@ #define __ASM_BREF(label) label ## b -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ /* * In asm, there are two kinds of code: normal C-type callable functions and @@ -102,11 +102,11 @@ #endif .endm -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #else /* !CONFIG_OBJTOOL */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #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 c6def4049b1ae..c24e9ea392696 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 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -18,7 +18,7 @@ struct unwind_hint { u8 signal; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* * UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in -- 2.54.0