From nobody Thu Dec 18 07:30:29 2025 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 977821C84D7 for ; Fri, 14 Mar 2025 07:11:30 +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=1741936292; cv=none; b=EjUDOuimWMwWvVGtZAiGj0ABy4J0+8tdm2RFSPfUyESJjLbUYjF/Y154J7Cu0Ds17T9LKaUa8FINEn6+c9cT1JH0IeOz+/2UDuqI9SQJLSVtFo+gYnnqzrL8AIOXv41/84hYZwaqio9XIPeVir2TQ2+eWOmDX4R99vwCjwSgE2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741936292; c=relaxed/simple; bh=0yeI7KPM3DrA74pKr4To6izu2he9Dnih0eusBEOCKtQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JbGVSpExUizSazm58vhjVFfjdXsLVpxrAGdc6Z5E+TT09m62fl95rGG5VgfDYnkebiWauG8uKj6kkcbNEOIA9Gm/3S7LnJNtu90Iw32r/8sRJqC9H6tJUeKRXYdCjKgx2tz9by+o927nSA6Q3479EG9RwjKWM8oF+f/Zb5eIUZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=ReLt0Y72; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="ReLt0Y72" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741936289; 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: in-reply-to:in-reply-to:references:references; bh=4JbwPTO4YfmvIeYNcqcXZBs/DWcx3nbAj8kVBIj11/k=; b=ReLt0Y72uSheGB7CyeHa3T0hlYll8Jlwz3yJ3xZQERuXto+FbTKsPczs539/t5JN0YV6gF JbJKepzsfpQp0xe3paJAzGkZSnNIlYQ+AsPt107++1wFLN7KAlArAnicVMzD35urjdQ0uk aJMfFc58a7LD4tKVumzjS7fO2Qpkp3M= Received: from mx-prod-mc-04.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-688-S0oHB4pJNmyawCZrkiKdvw-1; Fri, 14 Mar 2025 03:11:26 -0400 X-MC-Unique: S0oHB4pJNmyawCZrkiKdvw-1 X-Mimecast-MFC-AGG-ID: S0oHB4pJNmyawCZrkiKdvw_1741936284 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C79D71956048; Fri, 14 Mar 2025 07:11:24 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4F24418001D4; Fri, 14 Mar 2025 07:11:22 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-arch@vger.kernel.org, Thomas Huth , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Date: Fri, 14 Mar 2025 08:09:44 +0100 Message-ID: <20250314071013.1575167-14-thuth@redhat.com> In-Reply-To: <20250314071013.1575167-1-thuth@redhat.com> References: <20250314071013.1575167-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.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" 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 on the __ASSEMBLER__ macro that is provided by the compilers now. This is a completely mechanical patch (done with a simple "sed -i" statement). Cc: Brian Cain Cc: linux-hexagon@vger.kernel.org Signed-off-by: Thomas Huth Acked-by: Brian Cain --- arch/hexagon/include/asm/hexagon_vm.h | 4 ++-- arch/hexagon/include/asm/mem-layout.h | 6 +++--- arch/hexagon/include/asm/page.h | 4 ++-- arch/hexagon/include/asm/processor.h | 4 ++-- arch/hexagon/include/asm/thread_info.h | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/hexagon/include/asm/hexagon_vm.h b/arch/hexagon/include/a= sm/hexagon_vm.h index 9aa2493fe7863..e1e702eb9e12a 100644 --- a/arch/hexagon/include/asm/hexagon_vm.h +++ b/arch/hexagon/include/asm/hexagon_vm.h @@ -39,7 +39,7 @@ #define HVM_TRAP1_VMGETREGS 22 #define HVM_TRAP1_VMTIMEROP 24 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 enum VM_CACHE_OPS { hvmc_ickill, @@ -178,7 +178,7 @@ static inline long __vmintop_clear(long i) =20 #else /* Only assembly code should reference these */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * Constants for virtual instruction parameters and return values diff --git a/arch/hexagon/include/asm/mem-layout.h b/arch/hexagon/include/a= sm/mem-layout.h index e2f99413fe56e..8bad920d8928a 100644 --- a/arch/hexagon/include/asm/mem-layout.h +++ b/arch/hexagon/include/asm/mem-layout.h @@ -25,7 +25,7 @@ */ =20 #ifdef CONFIG_HEXAGON_PHYS_OFFSET -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern unsigned long __phys_offset; #endif #define PHYS_OFFSET __phys_offset @@ -44,7 +44,7 @@ extern unsigned long __phys_offset; #define STACK_TOP TASK_SIZE #define STACK_TOP_MAX TASK_SIZE =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ enum fixed_addresses { FIX_KMAP_BEGIN, FIX_KMAP_END, /* check for per-cpuism */ @@ -101,7 +101,7 @@ extern int max_kernel_seg; * and pkmap_base begins. */ #define VMALLOC_END (PKMAP_BASE-PAGE_SIZE*2) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 =20 #endif /* _ASM_HEXAGON_MEM_LAYOUT_H */ diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/pag= e.h index 137ba7c5de481..7e651428a08c0 100644 --- a/arch/hexagon/include/asm/page.h +++ b/arch/hexagon/include/asm/page.h @@ -48,7 +48,7 @@ #include =20 #ifdef __KERNEL__ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * This is for PFN_DOWN, which mm.h needs. Seems the right place to pull = it in. @@ -128,7 +128,7 @@ static inline unsigned long virt_to_pfn(const void *kad= dr) /* XXX Todo: implement assembly-optimized version of getorder. */ #include =20 -#endif /* ifdef __ASSEMBLY__ */ +#endif /* ifdef __ASSEMBLER__ */ #endif /* ifdef __KERNEL__ */ =20 #endif diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/as= m/processor.h index 0cd39c2cdf8f7..b93c2cc4be22e 100644 --- a/arch/hexagon/include/asm/processor.h +++ b/arch/hexagon/include/asm/processor.h @@ -8,7 +8,7 @@ #ifndef _ASM_PROCESSOR_H #define _ASM_PROCESSOR_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -124,6 +124,6 @@ struct hexagon_switch_stack { unsigned long lr; }; =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/include/= asm/thread_info.h index e90f280b9ce3e..a0da6c694c87b 100644 --- a/arch/hexagon/include/asm/thread_info.h +++ b/arch/hexagon/include/asm/thread_info.h @@ -10,7 +10,7 @@ =20 #ifdef __KERNEL__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #include @@ -20,7 +20,7 @@ #define THREAD_SIZE (1< =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define INIT_THREAD_INFO(tsk) \ { \ @@ -73,7 +73,7 @@ struct thread_info { register struct thread_info *__current_thread_info asm(QUOTED_THREADINFO_R= EG); #define current_thread_info() __current_thread_info =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * thread information flags --=20 2.48.1