From nobody Tue Dec 2 01:33:06 2025 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 4526F2D97BF for ; Fri, 21 Nov 2025 10:01:06 +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=1763719270; cv=none; b=RoP76A2rJEiKIXRnB5ypazJQjqu33KdYxp93Ei0oaSa++7VoMAV0dICC6+e0pZNHg17BoFLr+SZXq/OIx8A6BBsurNRCySfo3I1spznnLvt5zu3FIV8rDydDvNyMuJ4SPnZPs5HvNJSdg16z19YYI9zFGIovy0CmpKnvpFdihgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719270; c=relaxed/simple; bh=Cka2pXkveMFbrHgxTTmCWcgccG7G3JtklVVdOgKNGMc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LApr5/nQAnqM52g2tJMVzo3bJpR7qogrbllnarpKSiad2mmD0FsxPXEXLqCQIZolFo3JEtfqrQRorSvTRs88xGfAdwR16yDTitmW+AA0NmhUqBPAzn/5NNkO/0yo6egKKhpCBRe/BBeoqNyqOoLGzM5wgGvHgKwlmxbrPROWIbc= 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=cCNKWJNW; 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="cCNKWJNW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719266; 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=Xs9hFXjxHYcZUclg4NlpbaDnMsr/N1ltxM2HK/AdDKg=; b=cCNKWJNW6odus6hH10/oUoL0yhWKWcePSgpy4nVwWwmutujkxn3ONC6aATZAH73V3kerGq 0dtgsrNoB1gi3WhoQAuiqxmgnBEomlWo+lM+ybYui4HGXvE/EM/pQkEuz3V/4tlWV/eAUy Rhd/RlAIHnf+lajT8nAXA8wdRFJ94oY= Received: from mx-prod-mc-01.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-115-FZzLDDgsNCOYi9GiTjyANw-1; Fri, 21 Nov 2025 05:01:02 -0500 X-MC-Unique: FZzLDDgsNCOYi9GiTjyANw-1 X-Mimecast-MFC-AGG-ID: FZzLDDgsNCOYi9GiTjyANw_1763719261 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D859B1954B06; Fri, 21 Nov 2025 10:01:00 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5758A1955F66; Fri, 21 Nov 2025 10:00:57 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth , Richard Henderson , Matt Turner , linux-alpha@vger.kernel.org Subject: [PATCH v4 1/9] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers Date: Fri, 21 Nov 2025 11:00:36 +0100 Message-ID: <20251121100044.282684-2-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" 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). Cc: Richard Henderson Cc: Matt Turner Cc: linux-alpha@vger.kernel.org Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. Reviewed-by: Magnus Lindholm --- arch/alpha/include/asm/console.h | 4 ++-- arch/alpha/include/asm/page.h | 4 ++-- arch/alpha/include/asm/pal.h | 4 ++-- arch/alpha/include/asm/thread_info.h | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/alpha/include/asm/console.h b/arch/alpha/include/asm/cons= ole.h index 088b7b9eb15ae..1cabdb6064bbe 100644 --- a/arch/alpha/include/asm/console.h +++ b/arch/alpha/include/asm/console.h @@ -4,7 +4,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern long callback_puts(long unit, const char *s, long length); extern long callback_getc(long unit); extern long callback_open_console(void); @@ -26,5 +26,5 @@ struct crb_struct; struct hwrpb_struct; extern int callback_init_done; extern void * callback_init(void *); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __AXP_CONSOLE_H */ diff --git a/arch/alpha/include/asm/page.h b/arch/alpha/include/asm/page.h index 5ec4c77e432e0..d2c6667d73e9e 100644 --- a/arch/alpha/include/asm/page.h +++ b/arch/alpha/include/asm/page.h @@ -6,7 +6,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define STRICT_MM_TYPECHECKS =20 @@ -74,7 +74,7 @@ typedef struct page *pgtable_t; #define PAGE_OFFSET 0xfffffc0000000000 #endif =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) diff --git a/arch/alpha/include/asm/pal.h b/arch/alpha/include/asm/pal.h index db2b3b18b34c7..799a64c051984 100644 --- a/arch/alpha/include/asm/pal.h +++ b/arch/alpha/include/asm/pal.h @@ -4,7 +4,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 extern void halt(void) __attribute__((noreturn)); #define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_ha= lt)) @@ -183,5 +183,5 @@ qemu_get_vmtime(void) return v0; } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ALPHA_PAL_H */ diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/= thread_info.h index 4a4d00b37986e..98ccbca64984c 100644 --- a/arch/alpha/include/asm/thread_info.h +++ b/arch/alpha/include/asm/thread_info.h @@ -4,14 +4,14 @@ =20 #ifdef __KERNEL__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #include #include #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct thread_info { struct pcb_struct pcb; /* palcode state */ =20 @@ -44,7 +44,7 @@ register struct thread_info *__current_thread_info __asm_= _("$8"); =20 register unsigned long *current_stack_pointer __asm__ ("$30"); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* Thread information allocation. */ #define THREAD_SIZE_ORDER 1 @@ -110,7 +110,7 @@ register unsigned long *current_stack_pointer __asm__ (= "$30"); put_user(res, (int __user *)(value)); \ }) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern void __save_fpu(void); =20 static inline void save_fpu(void) --=20 2.51.1 From nobody Tue Dec 2 01:33:06 2025 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 CC70830170B for ; Fri, 21 Nov 2025 10:01:12 +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=1763719274; cv=none; b=thGBrDe4NRHvleyyDLK9d0pPhbCpGIW0pbv5a8QxJ6m34KOttENbUWXFAVkf1e51em9H/M8bNeh9g6RSm/jmxoGl5cFGat7psFsohzha2WRsuurg2EOYK8Wtre1CXP4LTwYZiW3z/5R+z6nvW8b7oc0mo10T0A72Xp922QQB7jM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719274; c=relaxed/simple; bh=tTBrStqZDoU4dQkJ53jPDPLNkhKZ68tF63B1Vr2sOng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VCXAvi4WhZC3J2DcsDf43kJdIkkM7wtq4DjWW6QuljjpFkfumifa973Vs4KXx0sLz7Vrps9SP+thDeCo7Yw4cRLSs8dkjow3h0cssoA1AvdLbaWcnP/hZ0baf4GsrWcE757bXWXWpXEv/4RlGHDcMHPfSuoDeYAznS5DEoa9Q2c= 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=Q6fLr6D+; 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="Q6fLr6D+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719271; 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=Nc9aRQB9cflUGnoGvuuPbilyJvXJTYtWgN2fto6TDTw=; b=Q6fLr6D+C0xtDHoYZ6k2T0DHXH+V3S2vFl0GMm2ZVJHAL1/o6bgBhu35NaIN2UF4mz3/6p +Iw5hWaZQ928nK8sP78BoVvJKy7vsUDtGybRVybOYMnTUeyeP2Ij//ilhxF95ZYdvxZZYq ib2vXs30aqLcKT0zYSs8Ui66hqhKtqY= 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-341-1ukCfpEfMKCdA65478e4fw-1; Fri, 21 Nov 2025 05:01:06 -0500 X-MC-Unique: 1ukCfpEfMKCdA65478e4fw-1 X-Mimecast-MFC-AGG-ID: 1ukCfpEfMKCdA65478e4fw_1763719265 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 EE1A3195605B; Fri, 21 Nov 2025 10:01:04 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5E3CD1955F6E; Fri, 21 Nov 2025 10:01:01 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth , Russell King Subject: [PATCH v4 2/9] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Date: Fri, 21 Nov 2025 11:00:37 +0100 Message-ID: <20251121100044.282684-3-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth __ASSEMBLY__ is only defined by the Makefile of the kernel, so this is not really useful for uapi headers (unless the userspace Makefile defines it, too). Let's switch to __ASSEMBLER__ which gets set automatically by the compiler when compiling assembly code. Cc: Russell King Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- arch/arm/include/uapi/asm/ptrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm= /ptrace.h index 8896c23ccba78..fb829c96dc2ae 100644 --- a/arch/arm/include/uapi/asm/ptrace.h +++ b/arch/arm/include/uapi/asm/ptrace.h @@ -119,7 +119,7 @@ #define PT_DATA_ADDR 0x10004 #define PT_TEXT_END_ADDR 0x10008 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * This struct defines the way the registers are stored on the @@ -158,6 +158,6 @@ struct pt_regs { #define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ ) =20 =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _UAPI__ASM_ARM_PTRACE_H */ --=20 2.51.1 From nobody Tue Dec 2 01:33:06 2025 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 D5FB534B691 for ; Fri, 21 Nov 2025 10:01:14 +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=1763719279; cv=none; b=nNV1ky0Y/PGyxlsW9Jp1b1W6FH3cY4eO7o9U92K49c61BK1FR5kr4tuMZXnboS6GG6HH84QjVytlYQGLOJdZEVUdV/U7ATomMs3ts3HzEhsKlV0x7M9G22sKeXsmTy6uBN1oreVSAUCmihnyYvnCVN5j8Nl0xzmzDZTiVZNcQdk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719279; c=relaxed/simple; bh=5NFG9zYGJDCC0tU8JLmcZ80BvrnNyHeNZ9l9nB5EonI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ET0i1+uI3UPECXFHUJBkbj+OgoqwixGSMkDKbbJXKzJPOLnUnNx27xsXtEhD86Zh1PEbt75AeXizjZ9rSeeZmSiHKr3v9Zak6IEkd6GflxW8EIV45OQoild/QLY3qlGezfzNa1sZyGP0OZg80Q5LzPrepOvuXjrSLBACuIsqfxI= 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=gewQxoCB; 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="gewQxoCB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719273; 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=fav3y8h8nJPPN9sio+u+Q3x71Q5Lp3sUBRhdM7MrD/Q=; b=gewQxoCBhYgIKpMAwg6UuyHc9ehRX3peB7B+dVF6xcEDaNDtge6/9NzIrpQWi3EB7/oOFj gHrvHZN2VpRmbyakkebibWk3R/OOGhxXwWbJPag/zwMFRGyhjN/BwW5K/EgFg+BZDKD7Nw y3ZtzKLXAIJJOATPgAc2Nd2gibZB+sI= 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-439-Pb0UuUS5PU-A8_o_LIeW8g-1; Fri, 21 Nov 2025 05:01:10 -0500 X-MC-Unique: Pb0UuUS5PU-A8_o_LIeW8g-1 X-Mimecast-MFC-AGG-ID: Pb0UuUS5PU-A8_o_LIeW8g_1763719269 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 130A11956067; Fri, 21 Nov 2025 10:01:09 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6E9851955F67; Fri, 21 Nov 2025 10:01:05 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth , Russell King Subject: [PATCH v4 3/9] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Date: Fri, 21 Nov 2025 11:00:38 +0100 Message-ID: <20251121100044.282684-4-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" 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). Cc: Russell King Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- arch/arm/include/asm/arch_gicv3.h | 4 ++-- arch/arm/include/asm/assembler.h | 2 +- arch/arm/include/asm/barrier.h | 4 ++-- arch/arm/include/asm/cache.h | 2 +- arch/arm/include/asm/cp15.h | 4 ++-- arch/arm/include/asm/cputype.h | 4 ++-- arch/arm/include/asm/current.h | 4 ++-- arch/arm/include/asm/delay.h | 4 ++-- arch/arm/include/asm/domain.h | 8 ++++---- arch/arm/include/asm/fpstate.h | 2 +- arch/arm/include/asm/ftrace.h | 6 +++--- arch/arm/include/asm/hardware/cache-b15-rac.h | 2 +- arch/arm/include/asm/hardware/cache-l2x0.h | 4 ++-- arch/arm/include/asm/hardware/dec21285.h | 2 +- arch/arm/include/asm/hardware/ioc.h | 2 +- arch/arm/include/asm/hardware/iomd.h | 4 ++-- arch/arm/include/asm/hardware/memc.h | 2 +- arch/arm/include/asm/hwcap.h | 2 +- arch/arm/include/asm/irq.h | 2 +- arch/arm/include/asm/jump_label.h | 4 ++-- arch/arm/include/asm/kexec.h | 4 ++-- arch/arm/include/asm/kgdb.h | 4 ++-- arch/arm/include/asm/mach/arch.h | 2 +- arch/arm/include/asm/mcpm.h | 4 ++-- arch/arm/include/asm/memory.h | 4 ++-- arch/arm/include/asm/mpu.h | 4 ++-- arch/arm/include/asm/opcodes.h | 12 ++++++------ arch/arm/include/asm/page.h | 4 ++-- arch/arm/include/asm/pgtable-2level.h | 4 ++-- arch/arm/include/asm/pgtable-3level.h | 4 ++-- arch/arm/include/asm/pgtable-nommu.h | 4 ++-- arch/arm/include/asm/pgtable.h | 10 +++++----- arch/arm/include/asm/probes.h | 4 ++-- arch/arm/include/asm/proc-fns.h | 4 ++-- arch/arm/include/asm/ptrace.h | 4 ++-- arch/arm/include/asm/system_info.h | 4 ++-- arch/arm/include/asm/system_misc.h | 4 ++-- arch/arm/include/asm/thread_info.h | 2 +- arch/arm/include/asm/thread_notify.h | 2 +- arch/arm/include/asm/tlbflush.h | 10 +++++----- arch/arm/include/asm/tls.h | 4 ++-- arch/arm/include/asm/unified.h | 6 +++--- arch/arm/include/asm/unwind.h | 4 ++-- arch/arm/include/asm/v7m.h | 4 ++-- arch/arm/include/asm/vdso.h | 4 ++-- arch/arm/include/asm/vdso/cp15.h | 4 ++-- arch/arm/include/asm/vdso/gettimeofday.h | 4 ++-- arch/arm/include/asm/vdso/processor.h | 4 ++-- arch/arm/include/asm/vdso/vsyscall.h | 4 ++-- arch/arm/include/asm/vfp.h | 2 +- arch/arm/include/asm/virt.h | 4 ++-- arch/arm/mach-at91/pm.h | 2 +- arch/arm/mach-exynos/smc.h | 4 ++-- arch/arm/mach-footbridge/include/mach/hardware.h | 2 +- arch/arm/mach-imx/hardware.h | 2 +- arch/arm/mach-imx/mxc.h | 2 +- arch/arm/mach-omap2/control.h | 8 ++++---- arch/arm/mach-omap2/soc.h | 4 ++-- arch/arm/mach-omap2/sram.h | 4 ++-- arch/arm/mach-pxa/irqs.h | 2 +- arch/arm/mach-pxa/pxa-regs.h | 2 +- arch/arm/mach-s3c/map-base.h | 2 +- arch/arm/mach-sa1100/include/mach/bitfield.h | 2 +- arch/arm/mach-sa1100/include/mach/hardware.h | 2 +- arch/arm/mach-tegra/reset.h | 2 +- arch/arm/mach-tegra/sleep.h | 2 +- arch/arm/tools/gen-mach-types | 2 +- drivers/memory/emif.h | 4 ++-- include/linux/arm-smccc.h | 6 +++--- 69 files changed, 130 insertions(+), 130 deletions(-) diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_= gicv3.h index 311e83038bdb3..847590df75511 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/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assemb= ler.h index d33c1e24e00b3..0f1f3b907825e 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -13,7 +13,7 @@ #ifndef __ASM_ASSEMBLER_H__ #define __ASM_ASSEMBLER_H__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #error "Only include this from assembly code" #endif =20 diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h index 83ae97c049d9b..af3516cfa8dcd 100644 --- a/arch/arm/include/asm/barrier.h +++ b/arch/arm/include/asm/barrier.h @@ -2,7 +2,7 @@ #ifndef __ASM_BARRIER_H #define __ASM_BARRIER_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t"); =20 @@ -99,5 +99,5 @@ static inline unsigned long array_index_mask_nospec(unsig= ned long idx, =20 #include =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_BARRIER_H */ diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h index ecbc100d22a56..38a38a53badc9 100644 --- a/arch/arm/include/asm/cache.h +++ b/arch/arm/include/asm/cache.h @@ -26,7 +26,7 @@ =20 #define __read_mostly __section(".data..read_mostly") =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_ARCH_HAS_CACHE_LINE_SIZE int cache_line_size(void); #endif diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h index a54230e656479..603a33c4bf572 100644 --- a/arch/arm/include/asm/cp15.h +++ b/arch/arm/include/asm/cp15.h @@ -40,7 +40,7 @@ #define CR_AFE (1 << 29) /* Access flag enable */ #define CR_TE (1 << 30) /* Thumb exception enable */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #if __LINUX_ARM_ARCH__ >=3D 4 #define vectors_high() (get_cr() & CR_V) @@ -117,6 +117,6 @@ static inline unsigned long get_cr(void) =20 #endif /* ifdef CONFIG_CPU_CP15 / else */ =20 -#endif /* ifndef __ASSEMBLY__ */ +#endif /* ifndef __ASSEMBLER__ */ =20 #endif diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index 0163c3e78a67f..4b2832e14c3e1 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@ -109,7 +109,7 @@ /* Qualcomm implemented cores */ #define ARM_CPU_PART_SCORPION 0x510002d0 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -343,6 +343,6 @@ static inline int __attribute_const__ cpuid_feature_ext= ract_field(u32 features, #define cpuid_feature_extract(reg, field) \ cpuid_feature_extract_field(read_cpuid_ext(reg), field) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/arch/arm/include/asm/current.h b/arch/arm/include/asm/current.h index 5225cb1c803b1..12968d3cdc269 100644 --- a/arch/arm/include/asm/current.h +++ b/arch/arm/include/asm/current.h @@ -7,7 +7,7 @@ #ifndef _ASM_ARM_CURRENT_H #define _ASM_ARM_CURRENT_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include =20 struct task_struct; @@ -60,6 +60,6 @@ static __always_inline __attribute_const__ struct task_st= ruct *get_current(void) =20 #define current get_current() =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ASM_ARM_CURRENT_H */ diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h index 1d069e558d8de..6fffc2547f9df 100644 --- a/arch/arm/include/asm/delay.h +++ b/arch/arm/include/asm/delay.h @@ -41,7 +41,7 @@ #define UDELAY_MULT UL(2147 * HZ + 483648 * HZ / 1000000) #define UDELAY_SHIFT 31 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct delay_timer { unsigned long (*read_current_timer)(void); @@ -94,7 +94,7 @@ extern void __loop_const_udelay(unsigned long); #define ARCH_HAS_READ_CURRENT_TIMER extern void register_current_timer_delay(const struct delay_timer *timer); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* defined(_ARM_DELAY_H) */ =20 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index d48859fdf32c5..66a06feb16c67 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -7,7 +7,7 @@ #ifndef __ASM_PROC_DOMAIN_H #define __ASM_PROC_DOMAIN_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #endif @@ -79,7 +79,7 @@ #define DACR_UACCESS_ENABLE \ (__DACR_DEFAULT | domain_val(DOMAIN_USER, DOMAIN_CLIENT)) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef CONFIG_CPU_CP15_MMU static __always_inline unsigned int get_domain(void) @@ -124,7 +124,7 @@ static __always_inline void set_domain(unsigned int val) #define TUSERCOND(instr, cond) #instr #cond #endif =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 /* * Generate the T (user) versions of the LDR/STR and related @@ -136,6 +136,6 @@ static __always_inline void set_domain(unsigned int val) #define TUSER(instr) instr #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* !__ASM_PROC_DOMAIN_H */ diff --git a/arch/arm/include/asm/fpstate.h b/arch/arm/include/asm/fpstate.h index e29d9c7a52388..2b4469e151851 100644 --- a/arch/arm/include/asm/fpstate.h +++ b/arch/arm/include/asm/fpstate.h @@ -9,7 +9,7 @@ #define __ASM_ARM_FPSTATE_H =20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * VFP storage area has: diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index 5be3ddc96a503..9675ede04f09c 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -12,7 +12,7 @@ #define MCOUNT_ADDR ((unsigned long)(__gnu_mcount_nc)) #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern void __gnu_mcount_nc(void); =20 #ifdef CONFIG_DYNAMIC_FTRACE @@ -33,7 +33,7 @@ static inline unsigned long ftrace_call_adjust(unsigned l= ong addr) =20 #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) /* @@ -79,6 +79,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigne= d long self, unsigned long frame_pointer, unsigned long stack_pointer); =20 -#endif /* ifndef __ASSEMBLY__ */ +#endif /* ifndef __ASSEMBLER__ */ =20 #endif /* _ASM_ARM_FTRACE */ diff --git a/arch/arm/include/asm/hardware/cache-b15-rac.h b/arch/arm/inclu= de/asm/hardware/cache-b15-rac.h index 3d43ec06fd359..b96365bfb2a87 100644 --- a/arch/arm/include/asm/hardware/cache-b15-rac.h +++ b/arch/arm/include/asm/hardware/cache-b15-rac.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_HARDWARE_CACHE_B15_RAC_H #define __ASM_ARM_HARDWARE_CACHE_B15_RAC_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 void b15_flush_kern_cache_all(void); =20 diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/= asm/hardware/cache-l2x0.h index 5a7ee70f561c9..2c9568768ad73 100644 --- a/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/arch/arm/include/asm/hardware/cache-l2x0.h @@ -147,7 +147,7 @@ =20 #define L2X0_WAY_SIZE_SHIFT 3 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask= ); #if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF) extern int l2x0_of_init(u32 aux_val, u32 aux_mask); @@ -187,6 +187,6 @@ struct l2x0_regs { =20 extern struct l2x0_regs l2x0_saved_regs; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/as= m/hardware/dec21285.h index 894f2a635cbbd..bf722733bbb6f 100644 --- a/arch/arm/include/asm/hardware/dec21285.h +++ b/arch/arm/include/asm/hardware/dec21285.h @@ -15,7 +15,7 @@ #define DC21285_PCI_IO 0x7c000000 #define DC21285_PCI_MEM 0x80000000 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #else diff --git a/arch/arm/include/asm/hardware/ioc.h b/arch/arm/include/asm/har= dware/ioc.h index 6edd27fcd0483..bd4f66591026b 100644 --- a/arch/arm/include/asm/hardware/ioc.h +++ b/arch/arm/include/asm/hardware/ioc.h @@ -10,7 +10,7 @@ #ifndef __ASMARM_HARDWARE_IOC_H #define __ASMARM_HARDWARE_IOC_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * We use __raw_base variants here so that we give the compiler the diff --git a/arch/arm/include/asm/hardware/iomd.h b/arch/arm/include/asm/ha= rdware/iomd.h index 53006ba5350f0..9b8a289f4db63 100644 --- a/arch/arm/include/asm/hardware/iomd.h +++ b/arch/arm/include/asm/hardware/iomd.h @@ -11,7 +11,7 @@ #define __ASMARM_HARDWARE_IOMD_H =20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * We use __raw_base variants here so that we give the compiler the @@ -167,7 +167,7 @@ #define VDMA_START IOMD_VIDSTART #define VDMA_END IOMD_VIDEND =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern unsigned int vram_half_sam; #define video_set_dma(start,end,offset) \ do { \ diff --git a/arch/arm/include/asm/hardware/memc.h b/arch/arm/include/asm/ha= rdware/memc.h index 1d4ebe0a9678f..8b1865cb564ec 100644 --- a/arch/arm/include/asm/hardware/memc.h +++ b/arch/arm/include/asm/hardware/memc.h @@ -10,7 +10,7 @@ #define VDMA_START 1 #define VDMA_END 2 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern void memc_write(unsigned int reg, unsigned long val); =20 #define video_set_dma(start,end,offset) \ diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h index e31d9f1b8549b..d5b5ebaad011b 100644 --- a/arch/arm/include/asm/hwcap.h +++ b/arch/arm/include/asm/hwcap.h @@ -4,7 +4,7 @@ =20 #include =20 -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 26c1d2ced4ce1..7c8f826071162 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -22,7 +22,7 @@ #define NO_IRQ ((unsigned int)(-1)) #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct irqaction; struct pt_regs; =20 diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_= label.h index a35aba7f548cc..11024b7f1ef4a 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/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h index a8287e7ab9d41..8488f4b611402 100644 --- a/arch/arm/include/asm/kexec.h +++ b/arch/arm/include/asm/kexec.h @@ -16,7 +16,7 @@ #define KEXEC_ARM_ATAGS_OFFSET 0x1000 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define ARCH_HAS_KIMAGE_ARCH struct kimage_arch { @@ -78,6 +78,6 @@ static inline struct page *boot_pfn_to_page(unsigned long= boot_pfn) } #define boot_pfn_to_page boot_pfn_to_page =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ARM_KEXEC_H */ diff --git a/arch/arm/include/asm/kgdb.h b/arch/arm/include/asm/kgdb.h index 8de1100d10674..1b7c65935976f 100644 --- a/arch/arm/include/asm/kgdb.h +++ b/arch/arm/include/asm/kgdb.h @@ -39,7 +39,7 @@ #define KGDB_COMPILED_BREAK 0xe7ffdeff #define CACHE_FLUSH_IS_SAFE 1 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 static inline void arch_kgdb_breakpoint(void) { @@ -49,7 +49,7 @@ static inline void arch_kgdb_breakpoint(void) extern void kgdb_handle_bus_error(void); extern int kgdb_fault_expected; =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 /* * From Kevin Hilman: diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/a= rch.h index 2b18a258204d7..ce0137aee0845 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@ -7,7 +7,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include =20 struct tag; diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h index 755c97de348c3..743f68f89337e 100644 --- a/arch/arm/include/asm/mcpm.h +++ b/arch/arm/include/asm/mcpm.h @@ -24,7 +24,7 @@ #define MAX_NR_CLUSTERS 2 #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -307,7 +307,7 @@ struct sync_struct { #include #define __CACHE_WRITEBACK_GRANULE CACHE_WRITEBACK_GRANULE =20 -#endif /* ! __ASSEMBLY__ */ +#endif /* ! __ASSEMBLER__ */ =20 /* Definitions for mcpm_sync_struct */ #define CPU_DOWN 0x11 diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 7c2fa7dcec6d4..308418f236e42 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -98,7 +98,7 @@ =20 #else /* CONFIG_MMU */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern unsigned long setup_vectors_base(void); extern unsigned long vectors_base; #define VECTORS_BASE vectors_base @@ -155,7 +155,7 @@ extern unsigned long vectors_base; */ #define PLAT_PHYS_OFFSET UL(CONFIG_PHYS_OFFSET) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * Physical start and end address of the kernel sections. These addresses = are diff --git a/arch/arm/include/asm/mpu.h b/arch/arm/include/asm/mpu.h index 5e088c83d3d8e..6058788a85730 100644 --- a/arch/arm/include/asm/mpu.h +++ b/arch/arm/include/asm/mpu.h @@ -91,7 +91,7 @@ #define PMSAv7_DATA_SIDE 0 #define PMSAv7_INSTR_SIDE 1 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct mpu_rgn { /* Assume same attributes for d/i-side */ @@ -128,6 +128,6 @@ static inline void pmsav7_setup(void) {}; static inline void pmsav8_setup(void) {}; #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h index 38e3eabff5c3f..c2e3ed5157cf3 100644 --- a/arch/arm/include/asm/opcodes.h +++ b/arch/arm/include/asm/opcodes.h @@ -6,7 +6,7 @@ #ifndef __ASM_ARM_OPCODES_H #define __ASM_ARM_OPCODES_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr); #endif @@ -71,7 +71,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 op= code, u32 psr); * involving inline assembler. For .S files, the normal __opcode_*() macr= os * should do the right thing. */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ =20 #define ___opcode_swab32(x) ___asm_opcode_swab32(x) #define ___opcode_swab16(x) ___asm_opcode_swab16(x) @@ -80,7 +80,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 op= code, u32 psr); #define ___opcode_identity32(x) ___asm_opcode_identity32(x) #define ___opcode_identity16(x) ___asm_opcode_identity16(x) =20 -#else /* ! __ASSEMBLY__ */ +#else /* ! __ASSEMBLER__ */ =20 #include #include @@ -92,7 +92,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 op= code, u32 psr); #define ___opcode_identity32(x) ((u32)(x)) #define ___opcode_identity16(x) ((u16)(x)) =20 -#endif /* ! __ASSEMBLY__ */ +#endif /* ! __ASSEMBLER__ */ =20 =20 #ifdef CONFIG_CPU_ENDIAN_BE8 @@ -111,7 +111,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 = opcode, u32 psr); #define ___asm_opcode_to_mem_arm(x) ___asm_opcode_identity32(x) #define ___asm_opcode_to_mem_thumb16(x) ___asm_opcode_identity16(x) #ifdef CONFIG_CPU_ENDIAN_BE32 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * On BE32 systems, using 32-bit accesses to store Thumb instructions will= not * work in all cases, due to alignment constraints. For now, a correct @@ -219,7 +219,7 @@ extern __u32 __opcode_to_mem_thumb32(__u32); #endif =20 /* Helpers for the helpers. Don't use these directly. */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define ___inst_arm(x) .long x #define ___inst_thumb16(x) .short x #define ___inst_thumb32(first, second) .short first, second diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index ef11b721230e2..79bdff0c34ab1 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h @@ -9,7 +9,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifndef CONFIG_MMU =20 @@ -180,7 +180,7 @@ extern int pfn_valid(unsigned long); #define pfn_valid pfn_valid #endif =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #include =20 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/p= gtable-2level.h index 6b5392e20f411..5edc1f3bdb090 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -175,7 +175,7 @@ #define L_PTE_MT_VECTORS (_AT(pteval_t, 0x0f) << 2) /* 1111 */ #define L_PTE_MT_MASK (_AT(pteval_t, 0x0f) << 2) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * The "pud_xxx()" functions here are trivial when the pmd is folded into @@ -242,6 +242,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned lo= ng addr) */ #define pmd_hugewillfault(pmd) (0) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ASM_PGTABLE_2LEVEL_H */ diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/p= gtable-3level.h index 7b71a3d414b72..5b17ebef203ea 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -109,7 +109,7 @@ */ #define L_PGD_SWAPPER (_AT(pgdval_t, 1) << 55) /* swapper_pg_dir entry */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define pud_none(pud) (!pud_val(pud)) #define pud_bad(pud) (!(pud_val(pud) & PUD_TABLE_BIT)) @@ -245,6 +245,6 @@ static inline void set_pmd_at(struct mm_struct *mm, uns= igned long addr, flush_pmd_entry(pmdp); } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ASM_PGTABLE_3LEVEL_H */ diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pg= table-nommu.h index 61480d096054d..a8bca82198381 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h @@ -8,7 +8,7 @@ #ifndef _ASMARM_PGTABLE_NOMMU_H #define _ASMARM_PGTABLE_NOMMU_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -84,6 +84,6 @@ extern unsigned int kobjsize(const void *objp); #define v6_user_fns (0) #define xscale_mc_user_fns (0) =20 -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ =20 #endif /* _ASMARM_PGTABLE_H */ diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 86378eec77573..2e9dac29f3d66 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -10,7 +10,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. @@ -52,7 +52,7 @@ extern struct page *empty_zero_page; =20 #define LIBRARY_TEXT_START 0x0c000000 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern void __pte_error(const char *file, int line, pte_t); extern void __pmd_error(const char *file, int line, pmd_t); extern void __pgd_error(const char *file, int line, pgd_t); @@ -135,7 +135,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file,= unsigned long pfn, __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_UNCACHED | L_PTE_XN) #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * The table below defines the page protection levels that we insert into = our @@ -146,7 +146,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file,= unsigned long pfn, * 3) write implies read permissions */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; =20 @@ -329,7 +329,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* CONFIG_MMU */ =20 diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h index ebbd9ec95d21c..0d5067e7f51a9 100644 --- a/arch/arm/include/asm/probes.h +++ b/arch/arm/include/asm/probes.h @@ -11,7 +11,7 @@ #ifndef _ASM_PROBES_H #define _ASM_PROBES_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 typedef u32 probes_opcode_t; =20 @@ -37,7 +37,7 @@ struct arch_probes_insn { bool kprobe_direct_exec; }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * We assume one instruction can consume at most 64 bytes stack, which is diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fn= s.h index b4986a23d8528..fd72f5fac6602 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -13,7 +13,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct mm_struct; =20 @@ -196,6 +196,6 @@ static inline void cpu_set_ttbcr(unsigned int ttbcr) =20 #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __KERNEL__ */ #endif /* __ASM_PROCFNS_H */ diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index 6eb311fb2da06..de3378a8845ec 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -9,7 +9,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include =20 @@ -198,5 +198,5 @@ static inline unsigned long it_advance(unsigned long cp= sr) int syscall_trace_enter(struct pt_regs *regs); void syscall_trace_exit(struct pt_regs *regs); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/arch/arm/include/asm/system_info.h b/arch/arm/include/asm/syst= em_info.h index ef7fdb588b5fe..3a872ec5d4e2e 100644 --- a/arch/arm/include/asm/system_info.h +++ b/arch/arm/include/asm/system_info.h @@ -14,7 +14,7 @@ #define CPU_ARCH_ARMv7 9 #define CPU_ARCH_ARMv7M 10 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* information about the system we're running on */ extern unsigned int system_rev; @@ -25,6 +25,6 @@ extern unsigned int mem_fclk_21285; =20 extern int __pure cpu_architecture(void); =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __ASM_ARM_SYSTEM_INFO_H */ diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/syst= em_misc.h index 98b37340376bc..8f9f7e833c013 100644 --- a/arch/arm/include/asm/system_misc.h +++ b/arch/arm/include/asm/system_misc.h @@ -2,7 +2,7 @@ #ifndef __ASM_ARM_SYSTEM_MISC_H #define __ASM_ARM_SYSTEM_MISC_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -37,6 +37,6 @@ static inline void harden_branch_predictor(void) =20 extern unsigned int user_debug; =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __ASM_ARM_SYSTEM_MISC_H */ diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thre= ad_info.h index 943ffcf069d29..186fd662b1c62 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -33,7 +33,7 @@ =20 #define OVERFLOW_STACK_SIZE SZ_4K =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct task_struct; =20 diff --git a/arch/arm/include/asm/thread_notify.h b/arch/arm/include/asm/th= read_notify.h index 1c1542e2ed634..eac8fc4837651 100644 --- a/arch/arm/include/asm/thread_notify.h +++ b/arch/arm/include/asm/thread_notify.h @@ -9,7 +9,7 @@ =20 #ifdef __KERNEL__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflus= h.h index 38c6e4a2a0b60..3eb0b3fa6cc9c 100644 --- a/arch/arm/include/asm/tlbflush.h +++ b/arch/arm/include/asm/tlbflush.h @@ -7,7 +7,7 @@ #ifndef _ASMARM_TLBFLUSH_H #define _ASMARM_TLBFLUSH_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ # include #endif =20 @@ -200,7 +200,7 @@ #error Unknown TLB model #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -641,7 +641,7 @@ static inline void update_mmu_cache_range(struct vm_fau= lt *vmf, =20 #elif defined(CONFIG_SMP) /* !CONFIG_MMU */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ static inline void local_flush_tlb_all(void) { } static inline void local_flush_tlb_mm(struct mm_struct *mm) { } static inline void local_flush_tlb_page(struct vm_area_struct *vma, unsign= ed long uaddr) { } @@ -657,11 +657,11 @@ extern void flush_tlb_kernel_page(unsigned long kaddr= ); extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long star= t, unsigned long end); extern void flush_tlb_kernel_range(unsigned long start, unsigned long end); extern void flush_bp_all(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_ARM_ERRATA_798181 extern void erratum_a15_798181_init(void); #else diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h index 3dcd0f71a0dae..9b09775e20931 100644 --- a/arch/arm/include/asm/tls.h +++ b/arch/arm/include/asm/tls.h @@ -5,7 +5,7 @@ #include #include =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #include .macro switch_tls_none, base, tp, tpuser, tmp1, tmp2 .endm @@ -68,7 +68,7 @@ ALT_UP_B(.L0_\@) #define switch_tls switch_tls_software #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 static inline void set_tls(unsigned long val) { diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h index ce9689118dbb9..2cdeafb6afb63 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -8,7 +8,7 @@ #ifndef __ASM_UNIFIED_H #define __ASM_UNIFIED_H =20 -#if defined(__ASSEMBLY__) +#if defined(__ASSEMBLER__) .syntax unified #else __asm__(".syntax unified"); @@ -29,7 +29,7 @@ __asm__(".syntax unified"); =20 #define ARM(x...) #define THUMB(x...) x -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define W(instr) instr.w #else #define WASM(instr) #instr ".w" @@ -42,7 +42,7 @@ __asm__(".syntax unified"); =20 #define ARM(x...) x #define THUMB(x...) -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define W(instr) instr #else #define WASM(instr) #instr diff --git a/arch/arm/include/asm/unwind.h b/arch/arm/include/asm/unwind.h index d60b09a5acfc3..071c89b1b4099 100644 --- a/arch/arm/include/asm/unwind.h +++ b/arch/arm/include/asm/unwind.h @@ -8,7 +8,7 @@ #ifndef __ASM_UNWIND_H #define __ASM_UNWIND_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* Unwind reason code according the the ARM EABI documents */ enum unwind_reason_code { @@ -44,7 +44,7 @@ void __aeabi_unwind_cpp_pr0(void); void __aeabi_unwind_cpp_pr1(void); void __aeabi_unwind_cpp_pr2(void); =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #ifdef CONFIG_ARM_UNWIND #define UNWIND(code...) code diff --git a/arch/arm/include/asm/v7m.h b/arch/arm/include/asm/v7m.h index 4512f7e1918f0..b334f8009a505 100644 --- a/arch/arm/include/asm/v7m.h +++ b/arch/arm/include/asm/v7m.h @@ -89,10 +89,10 @@ #define V7M_SCB_DCCISW 0x274 /* D-cache clean and invalidate by set-way */ #define V7M_SCB_BPIALL 0x278 /* D-cache clean and invalidate by set-way */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 enum reboot_mode; =20 void armv7m_restart(enum reboot_mode mode, const char *cmd); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ diff --git a/arch/arm/include/asm/vdso.h b/arch/arm/include/asm/vdso.h index 88364a6727ffc..93a7338cd3057 100644 --- a/arch/arm/include/asm/vdso.h +++ b/arch/arm/include/asm/vdso.h @@ -6,7 +6,7 @@ =20 #define __VDSO_PAGES 4 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct mm_struct; =20 @@ -26,7 +26,7 @@ static inline void arm_install_vdso(struct mm_struct *mm,= unsigned long addr) =20 #endif /* CONFIG_VDSO */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __KERNEL__ */ =20 diff --git a/arch/arm/include/asm/vdso/cp15.h b/arch/arm/include/asm/vdso/c= p15.h index bed16fa1865e9..f5dea30743765 100644 --- a/arch/arm/include/asm/vdso/cp15.h +++ b/arch/arm/include/asm/vdso/cp15.h @@ -5,7 +5,7 @@ #ifndef __ASM_VDSO_CP15_H #define __ASM_VDSO_CP15_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef CONFIG_CPU_CP15 =20 @@ -33,6 +33,6 @@ =20 #endif /* CONFIG_CPU_CP15 */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_VDSO_CP15_H */ diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/as= m/vdso/gettimeofday.h index 1e9f81639c88c..7e70c0998f1db 100644 --- a/arch/arm/include/asm/vdso/gettimeofday.h +++ b/arch/arm/include/asm/vdso/gettimeofday.h @@ -5,7 +5,7 @@ #ifndef __ASM_VDSO_GETTIMEOFDAY_H #define __ASM_VDSO_GETTIMEOFDAY_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -135,6 +135,6 @@ static __always_inline u64 __arch_get_hw_counter(int cl= ock_mode, #endif } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __ASM_VDSO_GETTIMEOFDAY_H */ diff --git a/arch/arm/include/asm/vdso/processor.h b/arch/arm/include/asm/v= dso/processor.h index 45efb3ff511c9..b24304f248b71 100644 --- a/arch/arm/include/asm/vdso/processor.h +++ b/arch/arm/include/asm/vdso/processor.h @@ -5,7 +5,7 @@ #ifndef __ASM_VDSO_PROCESSOR_H #define __ASM_VDSO_PROCESSOR_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #if __LINUX_ARM_ARCH__ =3D=3D 6 || defined(CONFIG_ARM_ERRATA_754327) #define cpu_relax() \ @@ -17,6 +17,6 @@ #define cpu_relax() barrier() #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_VDSO_PROCESSOR_H */ diff --git a/arch/arm/include/asm/vdso/vsyscall.h b/arch/arm/include/asm/vd= so/vsyscall.h index ff1c729af05f0..f6ef582cb3d8a 100644 --- a/arch/arm/include/asm/vdso/vsyscall.h +++ b/arch/arm/include/asm/vdso/vsyscall.h @@ -2,7 +2,7 @@ #ifndef __ASM_VDSO_VSYSCALL_H #define __ASM_VDSO_VSYSCALL_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -17,6 +17,6 @@ void __arch_sync_vdso_time_data(struct vdso_time_data *vd= ata) /* The asm-generic header needs to be included after the definitions above= */ #include =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/arm/include/asm/vfp.h b/arch/arm/include/asm/vfp.h index 85ccc422d4d0b..94171e09bda0b 100644 --- a/arch/arm/include/asm/vfp.h +++ b/arch/arm/include/asm/vfp.h @@ -90,7 +90,7 @@ #define VFPOPDESC_UNUSED_MASK (0xFF << VFPOPDESC_UNUSED_BIT) #define VFPOPDESC_OPDESC_MASK (~(VFPOPDESC_LENGTH_MASK | VFPOPDESC_UNUSED_= MASK)) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ void vfp_disable(void); #endif =20 diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h index dd9697b2bde80..719a08fa6a29b 100644 --- a/arch/arm/include/asm/virt.h +++ b/arch/arm/include/asm/virt.h @@ -15,7 +15,7 @@ */ #define BOOT_CPU_MODE_MISMATCH PSR_N_BIT =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include =20 #ifdef CONFIG_ARM_VIRT_EXT @@ -74,7 +74,7 @@ static inline bool is_kernel_in_hyp_mode(void) #define HVC_SET_VECTORS 0 #define HVC_SOFT_RESTART 1 =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #define HVC_STUB_ERR 0xbadca11 =20 diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 50c3a425d1400..2193e1ab98476 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -25,7 +25,7 @@ #define AT91_PM_ULP1 0x03 #define AT91_PM_BACKUP 0x04 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct at91_pm_data { void __iomem *pmc; void __iomem *ramc[2]; diff --git a/arch/arm/mach-exynos/smc.h b/arch/arm/mach-exynos/smc.h index 5c30feb8f07d9..5c7730f6259fc 100644 --- a/arch/arm/mach-exynos/smc.h +++ b/arch/arm/mach-exynos/smc.h @@ -32,11 +32,11 @@ #define SMC_REG_CLASS_SFR_W (0x1 << 30) #define SMC_REG_ID_SFR_W(addr) (SMC_REG_CLASS_SFR_W | ((addr) >> 2)) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 extern void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* op type for SMC_CMD_SAVE and SMC_CMD_SHUTDOWN */ #define OP_TYPE_CORE 0x0 diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/ma= ch-footbridge/include/mach/hardware.h index 985ad3a956712..5391848d8c8cc 100644 --- a/arch/arm/mach-footbridge/include/mach/hardware.h +++ b/arch/arm/mach-footbridge/include/mach/hardware.h @@ -79,7 +79,7 @@ #define CPLD_UNMUTE 2 #define CPLD_FLASH_WR_ENABLE 1 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern raw_spinlock_t nw_gpio_lock; extern void nw_gpio_modify_op(unsigned int mask, unsigned int set); extern void nw_gpio_modify_io(unsigned int mask, unsigned int in); diff --git a/arch/arm/mach-imx/hardware.h b/arch/arm/mach-imx/hardware.h index 0760fff39a0b3..71f09648c7778 100644 --- a/arch/arm/mach-imx/hardware.h +++ b/arch/arm/mach-imx/hardware.h @@ -7,7 +7,7 @@ #ifndef __ASM_ARCH_MXC_HARDWARE_H__ #define __ASM_ARCH_MXC_HARDWARE_H__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #endif diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index fe2d0f5abfcc2..1d13e3959159e 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -16,7 +16,7 @@ =20 #define IMX_DDR_TYPE_LPDDR2 1 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef CONFIG_SOC_IMX6SL static inline bool cpu_is_imx6sl(void) diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index 7e7440533bf90..e4f4b16958084 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -18,7 +18,7 @@ =20 #include "am33xx.h" =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #define OMAP242X_CTRL_REGADDR(reg) \ OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) #define OMAP243X_CTRL_REGADDR(reg) \ @@ -36,7 +36,7 @@ OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg)) #define AM33XX_CTRL_REGADDR(reg) \ AM33XX_L4_WK_IO_ADDRESS(AM33XX_SCM_BASE + (reg)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for @@ -503,7 +503,7 @@ #define FEAT_NEON_NONE 1 =20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_ARCH_OMAP2PLUS extern u8 omap_ctrl_readb(u16 offset); extern u16 omap_ctrl_readw(u16 offset); @@ -534,7 +534,7 @@ int omap_control_init(void); #define omap_ctrl_writel(x, y) WARN_ON(1) #define omap4_ctrl_pad_writel(x, y) WARN_ON(1) #endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __ARCH_ARM_MACH_OMAP2_CONTROL_H */ =20 diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 9e3dbb743e5c4..b3949559edadf 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -19,7 +19,7 @@ #include "am33xx.h" #include "omap54xx.h" =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -501,4 +501,4 @@ level(__##fn); #define cpu_is_ti816x() soc_is_ti816x() #define cpu_is_ti81xx() soc_is_ti81xx() =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ diff --git a/arch/arm/mach-omap2/sram.h b/arch/arm/mach-omap2/sram.h index 030cabc39821d..a1d72e014e62b 100644 --- a/arch/arm/mach-omap2/sram.h +++ b/arch/arm/mach-omap2/sram.h @@ -3,7 +3,7 @@ * Interface for functions that need to be run in internal SRAM */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 extern void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, u32 base_cs, u32 force_unlock); @@ -48,7 +48,7 @@ extern void omap_push_sram_idle(void); static inline void omap_push_sram_idle(void) {} #endif /* CONFIG_PM */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * OMAP2+: define the SRAM PA addresses. diff --git a/arch/arm/mach-pxa/irqs.h b/arch/arm/mach-pxa/irqs.h index 22bf536a462d0..07d7aa3a65065 100644 --- a/arch/arm/mach-pxa/irqs.h +++ b/arch/arm/mach-pxa/irqs.h @@ -94,7 +94,7 @@ =20 #define PXA_NR_IRQS (IRQ_BOARD_START) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct irq_data; struct pt_regs; =20 diff --git a/arch/arm/mach-pxa/pxa-regs.h b/arch/arm/mach-pxa/pxa-regs.h index ba5120c06b8a5..b56c8899042c4 100644 --- a/arch/arm/mach-pxa/pxa-regs.h +++ b/arch/arm/mach-pxa/pxa-regs.h @@ -31,7 +31,7 @@ #define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) <= < 1)) #define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c0000= 00) >> 1)) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ # define __REG(x) (*((volatile u32 __iomem *)io_p2v(x))) =20 /* With indexed regs we don't want to feed the index through io_p2v() diff --git a/arch/arm/mach-s3c/map-base.h b/arch/arm/mach-s3c/map-base.h index 463a995b399bc..beb58e6f12e16 100644 --- a/arch/arm/mach-s3c/map-base.h +++ b/arch/arm/mach-s3c/map-base.h @@ -20,7 +20,7 @@ =20 #define S3C_ADDR_BASE 0xF6000000 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #define S3C_ADDR(x) ((void __iomem __force *)S3C_ADDR_BASE + (x)) #else #define S3C_ADDR(x) (S3C_ADDR_BASE + (x)) diff --git a/arch/arm/mach-sa1100/include/mach/bitfield.h b/arch/arm/mach-s= a1100/include/mach/bitfield.h index f1f0e3387d9c6..e786bf730b31c 100644 --- a/arch/arm/mach-sa1100/include/mach/bitfield.h +++ b/arch/arm/mach-sa1100/include/mach/bitfield.h @@ -15,7 +15,7 @@ #ifndef __BITFIELD_H #define __BITFIELD_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #define UData(Data) ((unsigned long) (Data)) #else #define UData(Data) (Data) diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-s= a1100/include/mach/hardware.h index 6f2dbdc286632..350e2665ca495 100644 --- a/arch/arm/mach-sa1100/include/mach/hardware.h +++ b/arch/arm/mach-sa1100/include/mach/hardware.h @@ -39,7 +39,7 @@ =20 #define __MREG(x) IOMEM(io_p2v(x)) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 # define __REG(x) (*((volatile unsigned long __iomem *)io_p2v(x))) # define __PREG(x) (io_v2p((unsigned long)&(x))) diff --git a/arch/arm/mach-tegra/reset.h b/arch/arm/mach-tegra/reset.h index 51265592cb1ae..92a89713d5e57 100644 --- a/arch/arm/mach-tegra/reset.h +++ b/arch/arm/mach-tegra/reset.h @@ -21,7 +21,7 @@ =20 #define RESET_DATA(x) ((TEGRA_RESET_##x)*4) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include "irammap.h" =20 diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h index 4718a3cb45a16..e332d261c1dbd 100644 --- a/arch/arm/mach-tegra/sleep.h +++ b/arch/arm/mach-tegra/sleep.h @@ -38,7 +38,7 @@ #define TEGRA_FLUSH_CACHE_LOUIS 0 #define TEGRA_FLUSH_CACHE_ALL 1 =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ /* waits until the microsecond counter (base) is > rn */ .macro wait_until, rn, base, tmp add \rn, \rn, #1 diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index cbe1c33bb8710..6ad8f055ba6b5 100644 --- a/arch/arm/tools/gen-mach-types +++ b/arch/arm/tools/gen-mach-types @@ -29,7 +29,7 @@ END { printf(" */\n\n"); printf("#ifndef __ASM_ARM_MACH_TYPE_H\n"); printf("#define __ASM_ARM_MACH_TYPE_H\n\n"); - printf("#ifndef __ASSEMBLY__\n"); + printf("#ifndef __ASSEMBLER__\n"); printf("/* The type of machine we're running on */\n"); printf("extern unsigned int __machine_arch_type;\n"); printf("#endif\n\n"); diff --git a/drivers/memory/emif.h b/drivers/memory/emif.h index 55aeb36a5bf24..5dfb09adb0960 100644 --- a/drivers/memory/emif.h +++ b/drivers/memory/emif.h @@ -558,7 +558,7 @@ #define EMIF_SRAM_AM33_REG_LAYOUT 0x00000000 #define EMIF_SRAM_AM43_REG_LAYOUT 0x00000001 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Structure containing shadow of important registers in EMIF * The calculation function fills in this structure to be later used for @@ -603,5 +603,5 @@ void ti_emif_enter_sr(void); void ti_emif_exit_sr(void); void ti_emif_abort_sr(void); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __EMIF_H */ diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 50b47eba7d015..a95077b2fc17e 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -8,7 +8,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif =20 @@ -353,7 +353,7 @@ s32 arm_smccc_get_soc_id_version(void); */ s32 arm_smccc_get_soc_id_revision(void); =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * Returns whether a specific hypervisor UUID is advertised for the @@ -402,7 +402,7 @@ static inline u32 smccc_uuid_to_reg(const uuid_t *uuid,= int reg) return val; } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 /** * struct arm_smccc_res - Result from SMC/HVC call --=20 2.51.1 From nobody Tue Dec 2 01:33:06 2025 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 C114F34BA31 for ; Fri, 21 Nov 2025 10:01:17 +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=1763719279; cv=none; b=V6E9sZ51EQFb1sll+hzOpyZ36AhIYk63fM0pxDdRgnuBOxLFhqGxC4Z0jH9WeQP/IyuMSQdSloOjfD6OHqoD0km6uT9s1yvpNjbc5Or8/wkZ89TiegP1LlOT75mpp2vhULZsOF5ZUtsZxSCH78fOZxy204qWUt9pfld8/7MaXk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719279; c=relaxed/simple; bh=L4YFaTnsWWe+GAcc9P2MJG61bNdoHxPJA91P9A0Oq0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KVmkJrCj/LP4NloQPpBTQH1bD+RFcsFwtUghAXVhGMYMxvBnyvhvmgvE7TZgBpYm/Zs7KeTNd7baopxhc5Ac9L63Aed0u/W7yMSDJeEYQe7qD8oxp0huaO+os7yEOiInYOv/0of88WQ/KS0nFeW3Ri+XVUJGtfjNi93qYXaY7z8= 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=VEspEJ60; 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="VEspEJ60" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719276; 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=PyxNrZrZ4s0Cafl08yElNbsFTtb9GtmPPWVKnhiFUv0=; b=VEspEJ607Fb/3xt4etQZNCQebB8Ft61LoiL4Hzrkn60SpFZlWsPrqkuUhvMlfzOMSONfQY 8CxrjBle4DEBEvbUuCa0fmSvu4nFmwPRZUs97g+jdR1+pa4dShkyIPpLHDNq/xr2wO+xEL 1Sc7EqrwxdGp4FtwxiBUrLpm38tvNSM= Received: from mx-prod-mc-05.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-27-k3_x5bMqM3ipcdFdaf01Qg-1; Fri, 21 Nov 2025 05:01:14 -0500 X-MC-Unique: k3_x5bMqM3ipcdFdaf01Qg-1 X-Mimecast-MFC-AGG-ID: k3_x5bMqM3ipcdFdaf01Qg_1763719273 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1507619560BC; Fri, 21 Nov 2025 10:01:13 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CB4131955F66; Fri, 21 Nov 2025 10:01:09 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v4 4/9] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Date: Fri, 21 Nov 2025 11:00:39 +0100 Message-ID: <20251121100044.282684-5-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth __ASSEMBLY__ is only defined by the Makefile of the kernel, so this is not really useful for uapi headers (unless the userspace Makefile defines it, too). Let's switch to __ASSEMBLER__ which gets set automatically by the compiler when compiling assembly code. Cc: Brian Cain Cc: linux-hexagon@vger.kernel.org Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- arch/hexagon/include/uapi/asm/registers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/hexagon/include/uapi/asm/registers.h b/arch/hexagon/inclu= de/uapi/asm/registers.h index d51270f3b3582..8f73d41651e87 100644 --- a/arch/hexagon/include/uapi/asm/registers.h +++ b/arch/hexagon/include/uapi/asm/registers.h @@ -7,7 +7,7 @@ #ifndef _ASM_REGISTERS_H #define _ASM_REGISTERS_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* See kernel/entry.S for further documentation. */ =20 @@ -224,6 +224,6 @@ struct pt_regs { (regs)->hvmer.vmest =3D (HVM_VMEST_UM_MSK << HVM_VMEST_UM_SFT) \ | (HVM_VMEST_IE_MSK << HVM_VMEST_IE_SFT) =20 -#endif /* ifndef __ASSEMBLY */ +#endif /* ifndef __ASSEMBLER__ */ =20 #endif --=20 2.51.1 From nobody Tue Dec 2 01:33:06 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 1A86B34C155 for ; Fri, 21 Nov 2025 10:01:21 +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=1763719284; cv=none; b=F6usl/Fww6Y8iBQvbdIJxdzktL4Cpo5yLeTop/x5KCEe7G+Fn0l1Qrb4k7lqs2gyEz+IyWUwgs6EmjacU4T2aTGwQ31Gto8O0Vdc5aEuzVa3KuFBSm/DMY4uCCGYt6vsqYkrIdQfT8kfmV0MbXagrGr0vsYdZW1NNTSWN/DOsCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719284; c=relaxed/simple; bh=LT1BUueUeG/RSYzxYTNK+EK8UtaLF3x8AM0qu8TrIFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GvvwL4WXhMWGK83T8x1zcEyLatDubl0+jYz0VWkXti+pKrdIT3ibziGqIRuaTSRfFZLPFsqvfLRKVDnccEt3UEFdHC7Et59d06Pz7ViPPFARZ+3p6cLWCFO+WTnKNEcj3W2hLqriSG7BRAO1h3V+DGd6OVfGUAMr2BzUBEIL920= 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=SK8mgjV6; arc=none smtp.client-ip=170.10.133.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="SK8mgjV6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719281; 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=GrCua9hgAWiQ3//K2j8DdRzDOS0asZkTg7UL0JjeQzk=; b=SK8mgjV6fk9mG+utLeMOKyeFYuj52oEo7wrSvy/kNaiM35wT98ZQKqcgWV/IXiIESMRZS2 5BgbZHtS11/lng9eO1N9bqw6MmPGKYp0zD4y39pXBDuN1aNWLPH1k5yQ/NgqBpFf3wfWje F6UB767ZSI+/dRKMBDBUDr452Bfwntk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-JHYIc-gmNuCcW7X0uNxFAg-1; Fri, 21 Nov 2025 05:01:17 -0500 X-MC-Unique: JHYIc-gmNuCcW7X0uNxFAg-1 X-Mimecast-MFC-AGG-ID: JHYIc-gmNuCcW7X0uNxFAg_1763719276 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 234A9180122F; Fri, 21 Nov 2025 10:01:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 979731956045; Fri, 21 Nov 2025 10:01:13 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth , linux-hexagon@vger.kernel.org, Brian Cain Subject: [PATCH v4 5/9] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Date: Fri, 21 Nov 2025 11:00:40 +0100 Message-ID: <20251121100044.282684-6-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" 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). Cc: linux-hexagon@vger.kernel.org Acked-by: Brian Cain Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- 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.51.1 From nobody Tue Dec 2 01:33:06 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 62A92340D9E for ; Fri, 21 Nov 2025 10:01:25 +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=1763719287; cv=none; b=gudKSuln6T7SN0p1K369AfjFGAxJwFKBgb5Pji8BCCDbv4D3//tck7KQUZuMzM53YqV4DRaiY9ADp5gUECmEF4FutDC8yeaMuhpeUjDFajA6vuwpRKSZ9iIBbGNl3YtxDohT7tbOT9lMjbcXf6ZtUfaAx9KM3BHs7wft/qfYYqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719287; c=relaxed/simple; bh=LwRvAVOz9x5OyrTMiSJMSn0BAArGSPDSf4fZXbrtPLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DOkvwLe4ZV12F5jzVYCN17F3+7pBRp1OjL0AOk+6FkKu4A5WuWoaMP0bH3nEdDMDHUCoF2jhZREAuHLFgpfb1vS93Jd3sMKUJyqxrW6xbdv2Rs/5xP1S7OKWcurzJBIR7aqJ60Dend89PhQvOsHMzqsRYQCh03QLB/bGuIF/IvQ= 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=A+rpZ0JX; arc=none smtp.client-ip=170.10.133.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="A+rpZ0JX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719284; 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=IMUi3E5xQLGsvjrDLEu0jzTaGSgSK7r1Aug1eykzjqQ=; b=A+rpZ0JXawufHljGYTn9ZxDGK6NW/mOm3qJVvStM+OYtvHfwLALvh48P1ELsZZjUMKNpPf v7cFbS7LNR2OGqA9dQARsOHnFtjAfC/HEM8ojb6+VavsFgG3Mo9+r//oUp33g/EgZSVROm Uz8/4zs7H2K419Ju1jiHQ8k1pjmmiMQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-E0g8jvFNPGGdApUQwvZkvA-1; Fri, 21 Nov 2025 05:01:20 -0500 X-MC-Unique: E0g8jvFNPGGdApUQwvZkvA-1 X-Mimecast-MFC-AGG-ID: E0g8jvFNPGGdApUQwvZkvA_1763719279 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49BCF180034D; Fri, 21 Nov 2025 10:01:19 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA87A1955F67; Fri, 21 Nov 2025 10:01:16 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth Subject: [PATCH v4 6/9] uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Date: Fri, 21 Nov 2025 11:00:41 +0100 Message-ID: <20251121100044.282684-7-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth __ASSEMBLY__ is only defined by the Makefile of the kernel, so this is not really useful for uapi headers (unless the userspace Makefile defines it, too). Let's switch to __ASSEMBLER__ which gets set automatically by the compiler when compiling assembly code. Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- Documentation/dev-tools/checkuapi.rst | 2 +- include/uapi/asm-generic/int-l64.h | 4 ++-- include/uapi/asm-generic/int-ll64.h | 4 ++-- include/uapi/asm-generic/signal-defs.h | 2 +- include/uapi/asm-generic/signal.h | 4 ++-- include/uapi/linux/a.out.h | 4 ++-- include/uapi/linux/const.h | 4 ++-- include/uapi/linux/edd.h | 4 ++-- include/uapi/linux/hdlc/ioctl.h | 4 ++-- include/uapi/linux/sched.h | 2 +- include/uapi/linux/types.h | 4 ++-- tools/include/uapi/linux/const.h | 4 ++-- tools/perf/trace/beauty/include/uapi/linux/sched.h | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Documentation/dev-tools/checkuapi.rst b/Documentation/dev-tool= s/checkuapi.rst index 9072f21b50b0c..3c9a3a58c24da 100644 --- a/Documentation/dev-tools/checkuapi.rst +++ b/Documentation/dev-tools/checkuapi.rst @@ -273,7 +273,7 @@ Consider this change:: -typedef unsigned __bitwise __poll_t; +typedef unsigned short __bitwise __poll_t; =20 - #endif /* __ASSEMBLY__ */ + #endif /* __ASSEMBLER__ */ #endif /* _UAPI_LINUX_TYPES_H */ EOF =20 diff --git a/include/uapi/asm-generic/int-l64.h b/include/uapi/asm-generic/= int-l64.h index ed8bcd99c34d7..f840806bbe7e9 100644 --- a/include/uapi/asm-generic/int-l64.h +++ b/include/uapi/asm-generic/int-l64.h @@ -11,7 +11,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space @@ -29,7 +29,7 @@ typedef unsigned int __u32; typedef __signed__ long __s64; typedef unsigned long __u64; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 =20 #endif /* _UAPI_ASM_GENERIC_INT_L64_H */ diff --git a/include/uapi/asm-generic/int-ll64.h b/include/uapi/asm-generic= /int-ll64.h index 1ed06964257c3..4fc3e882bcff9 100644 --- a/include/uapi/asm-generic/int-ll64.h +++ b/include/uapi/asm-generic/int-ll64.h @@ -11,7 +11,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * header files exported to user space @@ -34,7 +34,7 @@ typedef __signed__ long long __s64; typedef unsigned long long __u64; #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 =20 #endif /* _UAPI_ASM_GENERIC_INT_LL64_H */ diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-gene= ric/signal-defs.h index 7572f2f46ee89..4073143fa3dae 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -78,7 +78,7 @@ #define SIG_SETMASK 2 /* for setting the signal mask */ #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef void __signalfn_t(int); typedef __signalfn_t __user *__sighandler_t; =20 diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/s= ignal.h index 0eb69dc8e5722..6b089d4b2965b 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h @@ -57,7 +57,7 @@ #define SIGSTKSZ 8192 #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; @@ -88,6 +88,6 @@ typedef struct sigaltstack { __kernel_size_t ss_size; } stack_t; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _UAPI__ASM_GENERIC_SIGNAL_H */ diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h index 5fafde3798e57..cbcc37674e64c 100644 --- a/include/uapi/linux/a.out.h +++ b/include/uapi/linux/a.out.h @@ -10,7 +10,7 @@ =20 #endif /* __STRUCT_EXEC_OVERRIDE__ */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* these go in the N_MACHTYPE field */ enum machine_type { @@ -247,5 +247,5 @@ struct relocation_info }; #endif /* no N_RELOCATION_INFO_DECLARED. */ =20 -#endif /*__ASSEMBLY__ */ +#endif /*__ASSEMBLER__ */ #endif /* _UAPI__A_OUT_GNU_H__ */ diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index b8f629ef135f3..42c89884b6be1 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -13,7 +13,7 @@ * leave it unchanged in asm. */ =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define _AC(X,Y) X #define _AT(T,X) X #else @@ -28,7 +28,7 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) =20 -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) /* * Missing asm support * diff --git a/include/uapi/linux/edd.h b/include/uapi/linux/edd.h index 0fe3e02aec653..566f206964862 100644 --- a/include/uapi/linux/edd.h +++ b/include/uapi/linux/edd.h @@ -53,7 +53,7 @@ #define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at E= DD_MBR_SIG_BUF in boot_params - treat this as 1 byte */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define EDD_EXT_FIXED_DISK_ACCESS (1 << 0) #define EDD_EXT_DEVICE_LOCKING_AND_EJECTING (1 << 1) @@ -187,6 +187,6 @@ struct edd { unsigned char edd_info_nr; }; =20 -#endif /*!__ASSEMBLY__ */ +#endif /*!__ASSEMBLER__ */ =20 #endif /* _UAPI_LINUX_EDD_H */ diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioct= l.h index b06341acab5ec..0905383d72aa5 100644 --- a/include/uapi/linux/hdlc/ioctl.h +++ b/include/uapi/linux/hdlc/ioctl.h @@ -35,7 +35,7 @@ #define LMI_CCITT 3 /* ITU-T Annex A */ #define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 typedef struct { unsigned int clock_rate; /* bits per second */ @@ -90,5 +90,5 @@ typedef struct { =20 /* PPP doesn't need any info now - supply length =3D 0 to ioctl */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __HDLC_IOCTL_H__ */ diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h index 359a14cc76a40..30f0c11959011 100644 --- a/include/uapi/linux/sched.h +++ b/include/uapi/linux/sched.h @@ -43,7 +43,7 @@ */ #define CLONE_NEWTIME 0x00000080 /* New time namespace */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /** * struct clone_args - arguments for the clone3 syscall * @flags: Flags for the new process as listed above. diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h index 48b933938877d..00743f894e7e3 100644 --- a/include/uapi/linux/types.h +++ b/include/uapi/linux/types.h @@ -4,7 +4,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifndef __KERNEL__ #ifndef __EXPORTED_HEADERS__ #warning "Attempt to use kernel headers from user space, see https://kerne= lnewbies.org/KernelHeaders" @@ -59,5 +59,5 @@ typedef __u32 __bitwise __wsum; =20 typedef unsigned __bitwise __poll_t; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_LINUX_TYPES_H */ diff --git a/tools/include/uapi/linux/const.h b/tools/include/uapi/linux/co= nst.h index b8f629ef135f3..42c89884b6be1 100644 --- a/tools/include/uapi/linux/const.h +++ b/tools/include/uapi/linux/const.h @@ -13,7 +13,7 @@ * leave it unchanged in asm. */ =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define _AC(X,Y) X #define _AT(T,X) X #else @@ -28,7 +28,7 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) =20 -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) /* * Missing asm support * diff --git a/tools/perf/trace/beauty/include/uapi/linux/sched.h b/tools/per= f/trace/beauty/include/uapi/linux/sched.h index 359a14cc76a40..30f0c11959011 100644 --- a/tools/perf/trace/beauty/include/uapi/linux/sched.h +++ b/tools/perf/trace/beauty/include/uapi/linux/sched.h @@ -43,7 +43,7 @@ */ #define CLONE_NEWTIME 0x00000080 /* New time namespace */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /** * struct clone_args - arguments for the clone3 syscall * @flags: Flags for the new process as listed above. --=20 2.51.1 From nobody Tue Dec 2 01:33:06 2025 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 1931A34CFBF for ; Fri, 21 Nov 2025 10:01:27 +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=1763719291; cv=none; b=NhkMclaCmTWPumYAuRZVZW6eeRBORMyFRwcPCdfZ2dMM4QJO0yg1zSdqRVaqH9Qcs0wDeBdRZBHMpu3BgKrLo9ZgI1jwJY2+9u0LD744R2zQXCW20MZJrSeIaOh2znqn7xgy9qAGuKgae0ejPgAGkuE6NFQu1UK2vfFFNdR4JkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719291; c=relaxed/simple; bh=HLgawoAy9DaAij1+s86Avcd2g0KZab1a2dtzO5/YVtA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XZO0VSR5s4QTSt2eqTMo5hgwwQAWfWZflcC3T7P07QenbhKFWdtRoc5WxMO4ON2PRe09tcLFsyUDJLQbJ/4TC+ME3OOoEdZagc2TIgMw8kvgtV+d+H/oppPRdW1pMt4OaVKQBtcuIar0hKaZnVrcyNo8WTRoZpgMAZywt7eMY9A= 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=L9o6nT5L; 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="L9o6nT5L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719287; 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=NWsngmRcWoomZwp/YKT5IiVx2Zr6I0AegdG9zHZZohY=; b=L9o6nT5LkH2N2YpEIXb5bxt9OZ12+BppcfOlGiLYoD0uCDTXIn/J/P0vaS5yDJCvfxBaly bJ1REu9OLYZZlEFb7ocPHEa8/r3sHCd4b30ywc1c0QFYoS4jzsuDSLbuytP8OR0KEazot/ iz8s0Ehws+2bQKxJt7p0SCW6aviSZWg= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-1TU8z1g3OAydl1nOpf8z0A-1; Fri, 21 Nov 2025 05:01:23 -0500 X-MC-Unique: 1TU8z1g3OAydl1nOpf8z0A-1 X-Mimecast-MFC-AGG-ID: 1TU8z1g3OAydl1nOpf8z0A_1763719282 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 181E31800673; Fri, 21 Nov 2025 10:01:22 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C3E7E1955F66; Fri, 21 Nov 2025 10:01:19 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth Subject: [PATCH v4 7/9] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Date: Fri, 21 Nov 2025 11:00:42 +0100 Message-ID: <20251121100044.282684-8-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" 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), except for some manual tweaking in the files include/linux/irqchip/arm-gic.h and include/soc/tegra/flowctrl.h (which got the macro wrong in a comment). Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- include/asm-generic/barrier.h | 4 ++-- include/asm-generic/bug.h | 4 ++-- include/asm-generic/current.h | 2 +- include/asm-generic/error-injection.h | 2 +- include/asm-generic/fixmap.h | 4 ++-- include/asm-generic/getorder.h | 4 ++-- include/asm-generic/int-ll64.h | 6 +++--- include/asm-generic/kprobes.h | 4 ++-- include/asm-generic/memory_model.h | 4 ++-- include/asm-generic/mmu.h | 2 +- include/asm-generic/pgtable-nop4d.h | 4 ++-- include/asm-generic/pgtable-nopmd.h | 4 ++-- include/asm-generic/pgtable-nopud.h | 4 ++-- include/asm-generic/rwonce.h | 4 ++-- include/asm-generic/signal.h | 4 ++-- include/asm-generic/vdso/vsyscall.h | 4 ++-- include/linux/amba/serial.h | 4 ++-- include/linux/annotate.h | 18 +++++++++--------- include/linux/arm-smccc.h | 4 ++-- include/linux/bitmap.h | 4 ++-- include/linux/bits.h | 6 +++--- include/linux/cfi_types.h | 6 +++--- include/linux/compiler.h | 4 ++-- include/linux/compiler_types.h | 4 ++-- include/linux/edd.h | 4 ++-- include/linux/err.h | 2 +- include/linux/export.h | 2 +- include/linux/init.h | 6 +++--- include/linux/ioport.h | 4 ++-- include/linux/irqchip/arm-gic-v3.h | 2 +- include/linux/irqchip/arm-gic.h | 4 ++-- include/linux/jump_label.h | 10 +++++----- include/linux/kexec.h | 2 +- include/linux/linkage.h | 6 +++--- include/linux/mem_encrypt.h | 4 ++-- include/linux/mmzone.h | 4 ++-- include/linux/objtool.h | 8 ++++---- include/linux/objtool_types.h | 4 ++-- include/linux/of_fdt.h | 4 ++-- include/linux/pe.h | 4 ++-- include/linux/percpu-defs.h | 4 ++-- include/linux/pfn.h | 2 +- include/linux/pgtable.h | 4 ++-- include/linux/platform_data/emif_plat.h | 4 ++-- include/linux/serial_s3c.h | 4 ++-- include/linux/static_call_types.h | 4 ++-- include/linux/ti-emif-sram.h | 2 +- include/linux/types.h | 4 ++-- include/soc/imx/cpu.h | 2 +- include/soc/tegra/flowctrl.h | 4 ++-- include/soc/tegra/fuse.h | 4 ++-- include/vdso/datapage.h | 6 +++--- include/vdso/helpers.h | 4 ++-- include/vdso/processor.h | 4 ++-- include/vdso/vsyscall.h | 4 ++-- include/xen/arm/interface.h | 2 +- include/xen/interface/xen-mca.h | 4 ++-- include/xen/interface/xen.h | 8 ++++---- tools/include/asm-generic/barrier.h | 4 ++-- tools/include/asm/alternative.h | 2 +- tools/include/linux/bits.h | 6 +++--- tools/include/linux/cfi_types.h | 6 +++--- tools/include/linux/compiler.h | 4 ++-- tools/include/linux/objtool_types.h | 4 ++-- tools/include/linux/static_call_types.h | 4 ++-- 65 files changed, 140 insertions(+), 140 deletions(-) diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h index d4f581c1e21da..e8038f7084a87 100644 --- a/include/asm-generic/barrier.h +++ b/include/asm-generic/barrier.h @@ -11,7 +11,7 @@ #ifndef __ASM_GENERIC_BARRIER_H #define __ASM_GENERIC_BARRIER_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -302,5 +302,5 @@ do { \ # define smp_mb__after_switch_mm() smp_mb() #endif =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_GENERIC_BARRIER_H */ diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 2d9f61346dab8..884f546477938 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -23,7 +23,7 @@ # define WARN_CONDITION_STR(cond_str) #endif =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include =20 @@ -231,6 +231,6 @@ extern __printf(1, 2) void __warn_printk(const char *fm= t, ...); # define WARN_ON_SMP(x) ({0;}) #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/include/asm-generic/current.h b/include/asm-generic/current.h index 9c2aeecbd05a6..8e7d8f019377f 100644 --- a/include/asm-generic/current.h +++ b/include/asm-generic/current.h @@ -2,7 +2,7 @@ #ifndef __ASM_GENERIC_CURRENT_H #define __ASM_GENERIC_CURRENT_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include =20 #define get_current() (current_thread_info()->task) diff --git a/include/asm-generic/error-injection.h b/include/asm-generic/er= ror-injection.h index b05253f68eaa5..0a9ec33fa8f20 100644 --- a/include/asm-generic/error-injection.h +++ b/include/asm-generic/error-injection.h @@ -2,7 +2,7 @@ #ifndef _ASM_GENERIC_ERROR_INJECTION_H #define _ASM_GENERIC_ERROR_INJECTION_H =20 -#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#if defined(__KERNEL__) && !defined(__ASSEMBLER__) enum { EI_ETYPE_NULL, /* Return NULL if failure */ EI_ETYPE_ERRNO, /* Return -ERRNO if failure */ diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h index 29cab7947980a..3ff832ebcea50 100644 --- a/include/asm-generic/fixmap.h +++ b/include/asm-generic/fixmap.h @@ -21,7 +21,7 @@ #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * 'index to address' translation. If anyone tries to use the idx * directly without translation, we catch the bug with a NULL-deference @@ -97,5 +97,5 @@ static inline unsigned long virt_to_fix(const unsigned lo= ng vaddr) #define set_fixmap_io(idx, phys) \ __set_fixmap(idx, phys, FIXMAP_PAGE_IO) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_GENERIC_FIXMAP_H */ diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h index f2979e3a96b60..875ccae196832 100644 --- a/include/asm-generic/getorder.h +++ b/include/asm-generic/getorder.h @@ -2,7 +2,7 @@ #ifndef __ASM_GENERIC_GETORDER_H #define __ASM_GENERIC_GETORDER_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -47,6 +47,6 @@ static __always_inline __attribute_const__ int get_order(= unsigned long size) #endif } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_GENERIC_GETORDER_H */ diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h index a248545f1e18c..58974e8abbfae 100644 --- a/include/asm-generic/int-ll64.h +++ b/include/asm-generic/int-ll64.h @@ -11,7 +11,7 @@ #include =20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 typedef __s8 s8; typedef __u8 u8; @@ -31,7 +31,7 @@ typedef __u64 u64; #define S64_C(x) x ## LL #define U64_C(x) x ## ULL =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 #define S8_C(x) x #define U8_C(x) x @@ -42,6 +42,6 @@ typedef __u64 u64; #define S64_C(x) x #define U64_C(x) x =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ASM_GENERIC_INT_LL64_H */ diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h index 060eab094e5a2..7161a90d0aa6e 100644 --- a/include/asm-generic/kprobes.h +++ b/include/asm-generic/kprobes.h @@ -2,7 +2,7 @@ #ifndef _ASM_GENERIC_KPROBES_H #define _ASM_GENERIC_KPROBES_H =20 -#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#if defined(__KERNEL__) && !defined(__ASSEMBLER__) #ifdef CONFIG_KPROBES /* * Blacklist ganerating macro. Specify functions which is not probed @@ -21,6 +21,6 @@ static unsigned long __used \ # define __kprobes # define nokprobe_inline inline #endif -#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ +#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */ =20 #endif /* _ASM_GENERIC_KPROBES_H */ diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memor= y_model.h index efa6610acbc79..fd74de50b0540 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h @@ -4,7 +4,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * supports 3 memory models. @@ -86,6 +86,6 @@ static inline int pfn_valid(unsigned long pfn) #endif /* CONFIG_DEBUG_VIRTUAL */ #define phys_to_page(phys) pfn_to_page(PHYS_PFN(phys)) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h index 0618380375429..5f78971e3ac2c 100644 --- a/include/asm-generic/mmu.h +++ b/include/asm-generic/mmu.h @@ -6,7 +6,7 @@ * This is the mmu.h header for nommu implementations. * Architectures with an MMU need something more complex. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { unsigned long end_brk; =20 diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgta= ble-nop4d.h index 03b7dae47dd43..89c21f84cffbe 100644 --- a/include/asm-generic/pgtable-nop4d.h +++ b/include/asm-generic/pgtable-nop4d.h @@ -2,7 +2,7 @@ #ifndef _PGTABLE_NOP4D_H #define _PGTABLE_NOP4D_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define __PAGETABLE_P4D_FOLDED 1 =20 @@ -54,5 +54,5 @@ static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long= address) #undef p4d_addr_end #define p4d_addr_end(addr, end) (end) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _PGTABLE_NOP4D_H */ diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgta= ble-nopmd.h index 8ffd64e7a24cb..36b6490ed1808 100644 --- a/include/asm-generic/pgtable-nopmd.h +++ b/include/asm-generic/pgtable-nopmd.h @@ -2,7 +2,7 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -68,6 +68,6 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *= pmd) #undef pmd_addr_end #define pmd_addr_end(addr, end) (end) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _PGTABLE_NOPMD_H */ diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgta= ble-nopud.h index eb70c6d7ceff2..356cbfbaab247 100644 --- a/include/asm-generic/pgtable-nopud.h +++ b/include/asm-generic/pgtable-nopud.h @@ -2,7 +2,7 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -62,5 +62,5 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long= address) #undef pud_addr_end #define pud_addr_end(addr, end) (end) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _PGTABLE_NOPUD_H */ diff --git a/include/asm-generic/rwonce.h b/include/asm-generic/rwonce.h index 52b969c7cef93..c35b262ee4223 100644 --- a/include/asm-generic/rwonce.h +++ b/include/asm-generic/rwonce.h @@ -20,7 +20,7 @@ #ifndef __ASM_GENERIC_RWONCE_H #define __ASM_GENERIC_RWONCE_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -94,5 +94,5 @@ unsigned long read_word_at_a_time(const void *addr) return *(unsigned long *)addr; } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_GENERIC_RWONCE_H */ diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h index 663dd6d0795dc..392e59fd3d8b9 100644 --- a/include/asm-generic/signal.h +++ b/include/asm-generic/signal.h @@ -4,10 +4,10 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #undef __HAVE_ARCH_SIG_BITOPS =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_GENERIC_SIGNAL_H */ diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso= /vsyscall.h index 5c6d9799f4e74..a6b03cfba0e24 100644 --- a/include/asm-generic/vdso/vsyscall.h +++ b/include/asm-generic/vdso/vsyscall.h @@ -2,7 +2,7 @@ #ifndef __ASM_GENERIC_VSYSCALL_H #define __ASM_GENERIC_VSYSCALL_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifndef __arch_get_vdso_u_time_data static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time= _data(void) @@ -30,6 +30,6 @@ static __always_inline void __arch_sync_vdso_time_data(st= ruct vdso_time_data *vd } #endif /* __arch_sync_vdso_time_data */ =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __ASM_GENERIC_VSYSCALL_H */ diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 9120de05ead08..b9129c0d6304f 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -10,7 +10,7 @@ #ifndef ASM_ARM_HARDWARE_SERIAL_AMBA_H #define ASM_ARM_HARDWARE_SERIAL_AMBA_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #endif @@ -215,7 +215,7 @@ #define UART01x_RSR_ANY (UART01x_RSR_OE | UART01x_RSR_BE | UART01x_RSR_PE= | UART01x_RSR_FE) #define UART01x_FR_MODEM_ANY (UART01x_FR_DCD | UART01x_FR_DSR | UART01x_FR= _CTS) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct amba_device; /* in uncompress this is included but amba/bus.h is no= t */ struct amba_pl010_data { void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned i= nt mctrl); diff --git a/include/linux/annotate.h b/include/linux/annotate.h index 7c10d34d198cf..11b755e6a9db1 100644 --- a/include/linux/annotate.h +++ b/include/linux/annotate.h @@ -6,7 +6,7 @@ =20 #ifdef CONFIG_OBJTOOL =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define __ASM_ANNOTATE(section, label, type) \ ".pushsection " section ",\"M\", @progbits, 8\n\t" \ @@ -25,7 +25,7 @@ "912:\n\t" \ __ASM_ANNOTATE(".discard.annotate_data", 912b, type) =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 .macro __ANNOTATE section, type .Lhere_\@: @@ -43,22 +43,22 @@ __ANNOTATE ".discard.annotate_data", \type .endm =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #else /* !CONFIG_OBJTOOL */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #define ASM_ANNOTATE_LABEL(label, type) "" #define ASM_ANNOTATE(type) #define ASM_ANNOTATE_DATA(type) -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ .macro ANNOTATE type .endm .macro ANNOTATE_DATA type .endm -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* !CONFIG_OBJTOOL */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * Annotate away the various 'relocation to !ENDBR` complaints; knowing th= at @@ -118,7 +118,7 @@ */ #define ANNOTATE_DATA_SPECIAL ASM_ANNOTATE_DATA(ANNOTYPE_DATA_SPECIAL) =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #define ANNOTATE_NOENDBR ANNOTATE type=3DANNOTYPE_NOENDBR #define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=3DANNOTYPE_RETPOLINE_SAFE /* ANNOTATE_INSTR_BEGIN ANNOTATE type=3DANNOTYPE_INSTR_BEGIN */ @@ -129,6 +129,6 @@ #define ANNOTATE_REACHABLE ANNOTATE type=3DANNOTYPE_REACHABLE #define ANNOTATE_NOCFI_SYM ANNOTATE type=3DANNOTYPE_NOCFI #define ANNOTATE_DATA_SPECIAL ANNOTATE_DATA type=3DANNOTYPE_DATA_SPECIAL -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _LINUX_ANNOTATE_H */ diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index a95077b2fc17e..96d7a61055a70 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -302,7 +302,7 @@ #define SMCCC_RET_NOT_REQUIRED -2 #define SMCCC_RET_INVALID_PARAMETER -3 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -750,5 +750,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsig= ned long a1, }) #endif /*CONFIG_ARM64*/ =20 -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /*__LINUX_ARM_SMCCC_H*/ diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index b0395e4ccf903..2e7f7bb0277f3 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -2,7 +2,7 @@ #ifndef __LINUX_BITMAP_H #define __LINUX_BITMAP_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -846,6 +846,6 @@ void bitmap_write(unsigned long *map, unsigned long val= ue, #define bitmap_set_value8(map, value, start) \ bitmap_write(map, value, start, BITS_PER_BYTE) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __LINUX_BITMAP_H */ diff --git a/include/linux/bits.h b/include/linux/bits.h index a40cc861b3a7c..b7509f15718e6 100644 --- a/include/linux/bits.h +++ b/include/linux/bits.h @@ -17,7 +17,7 @@ * position @h. For example * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. */ -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) =20 /* * Missing asm support @@ -75,7 +75,7 @@ #define BIT_U32(nr) BIT_TYPE(u32, nr) #define BIT_U64(nr) BIT_TYPE(u64, nr) =20 -#else /* defined(__ASSEMBLY__) */ +#else /* defined(__ASSEMBLER__) */ =20 /* * BUILD_BUG_ON_ZERO is not available in h files included from asm files, @@ -84,6 +84,6 @@ #define GENMASK(h, l) __GENMASK(h, l) #define GENMASK_ULL(h, l) __GENMASK_ULL(h, l) =20 -#endif /* !defined(__ASSEMBLY__) */ +#endif /* !defined(__ASSEMBLER__) */ =20 #endif /* __LINUX_BITS_H */ diff --git a/include/linux/cfi_types.h b/include/linux/cfi_types.h index a86af9bc8bdc4..b17614c493e4c 100644 --- a/include/linux/cfi_types.h +++ b/include/linux/cfi_types.h @@ -5,7 +5,7 @@ #ifndef _LINUX_CFI_TYPES_H #define _LINUX_CFI_TYPES_H =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #include =20 #ifdef CONFIG_CFI @@ -41,7 +41,7 @@ SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) #endif =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 #ifdef CONFIG_CFI #define DEFINE_CFI_TYPE(name, func) \ @@ -64,5 +64,5 @@ ); #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_CFI_TYPES_H */ diff --git a/include/linux/compiler.h b/include/linux/compiler.h index ff71bebe56f5c..081f7ec81f936 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -4,7 +4,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef __KERNEL__ =20 @@ -271,7 +271,7 @@ static inline void *offset_to_ptr(const int *off) return (void *)((unsigned long)off + *off); } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * Force the compiler to emit 'sym' as a symbol, so that we can reference diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index c46855162a8ab..d706fe4635e7c 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -15,7 +15,7 @@ #define ___PASTE(a, b) a##b #define __PASTE(a, b) ___PASTE(a, b) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * Skipped when running bindgen due to a libclang issue; @@ -422,7 +422,7 @@ struct ftrace_likely_data { =20 #endif /* __KERNEL__ */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* * The below symbols may be defined for one or more, but not ALL, of the a= bove diff --git a/include/linux/edd.h b/include/linux/edd.h index 1c16fbcb81c06..32517f283f044 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h @@ -23,7 +23,7 @@ =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern struct edd edd; -#endif /*!__ASSEMBLY__ */ +#endif /*!__ASSEMBLER__ */ #endif /* _LINUX_EDD_H */ diff --git a/include/linux/err.h b/include/linux/err.h index 8c37be0620abf..cd330aeabecd8 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -17,7 +17,7 @@ */ #define MAX_ERRNO 4095 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /** * IS_ERR_VALUE - Detect an error pointer. diff --git a/include/linux/export.h b/include/linux/export.h index a686fd0ba4065..432e980140f2b 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -51,7 +51,7 @@ =20 #define __EXPORT_SYMBOL(sym, license, ns) __GENKSYMS_EXPORT_SYMBOL(sym) =20 -#elif defined(__ASSEMBLY__) +#elif defined(__ASSEMBLER__) =20 #define __EXPORT_SYMBOL(sym, license, ns) \ ___EXPORT_SYMBOL(sym, license, ns) diff --git a/include/linux/init.h b/include/linux/init.h index 40331923b9f4a..e74e7283cd1cf 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -102,7 +102,7 @@ #define __REFDATA .section ".ref.data", "aw" #define __REFCONST .section ".ref.rodata", "a" =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Used for initialization calls.. */ @@ -180,7 +180,7 @@ extern struct module __this_module; =20 #ifndef MODULE =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * initcalls are now grouped by functionality into separate @@ -375,7 +375,7 @@ extern const struct obs_kernel_param __setup_start[], _= _setup_end[]; /* Relies on boot_command_line being set */ void __init parse_early_param(void); void __init parse_early_options(char *cmdline); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #else /* MODULE */ =20 diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 9afa30f9346fc..3c7cc25f3ec9d 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -9,7 +9,7 @@ #ifndef _LINUX_IOPORT_H #define _LINUX_IOPORT_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #include @@ -435,5 +435,5 @@ static inline void irqresource_disabled(struct resource= *res, u32 irq) =20 extern struct address_space *iomem_get_mapping(void); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_IOPORT_H */ diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm= -gic-v3.h index 70c0948f978eb..9628465516abc 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -603,7 +603,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 d45fa19f9e470..849386dc5ec80 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 diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index fdb79dd1ebd8c..b4bb7854963c3 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 @@ -107,12 +107,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 { @@ -187,7 +187,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, @@ -538,6 +538,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/kexec.h b/include/linux/kexec.h index 8a22bc9b8c6c8..0af8ae4fdd087 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -13,7 +13,7 @@ #define IND_SOURCE (1 << IND_SOURCE_BIT) #define IND_FLAGS (IND_DESTINATION | IND_INDIRECTION | IND_DONE | IND_SOUR= CE) =20 -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) =20 #include #include diff --git a/include/linux/linkage.h b/include/linux/linkage.h index b11660b706c58..dd7e3baff0b26 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -62,7 +62,7 @@ * end up needing stack temporaries for). */ /* Assembly files may be compiled with -traditional .. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifndef asmlinkage_protect # define asmlinkage_protect(n, ret, args...) do { } while (0) #endif @@ -73,7 +73,7 @@ #define __ALIGN_STR __stringify(__ALIGN) #endif =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ =20 /* SYM_T_FUNC -- type used by assembler to mark functions */ #ifndef SYM_T_FUNC @@ -351,6 +351,6 @@ SYM_DATA_END(name) #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _LINUX_LINKAGE_H */ diff --git a/include/linux/mem_encrypt.h b/include/linux/mem_encrypt.h index 07584c5e36fb4..463090c4f9517 100644 --- a/include/linux/mem_encrypt.h +++ b/include/linux/mem_encrypt.h @@ -10,7 +10,7 @@ #ifndef __MEM_ENCRYPT_H__ #define __MEM_ENCRYPT_H__ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef CONFIG_ARCH_HAS_MEM_ENCRYPT =20 @@ -54,6 +54,6 @@ #define dma_addr_canonical(x) (x) #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __MEM_ENCRYPT_H__ */ diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 4398e027f450e..694c20e4ae064 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -2,7 +2,7 @@ #ifndef _LINUX_MMZONE_H #define _LINUX_MMZONE_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifndef __GENERATING_BOUNDS_H =20 #include @@ -2306,5 +2306,5 @@ void sparse_init(void); #endif =20 #endif /* !__GENERATING_BOUNDS.H */ -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _LINUX_MMZONE_H */ diff --git a/include/linux/objtool.h b/include/linux/objtool.h index b18ab53561c99..2459eb0830002 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 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 =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 diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 51dadbaa3d63a..72b452e388eeb 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -16,7 +16,7 @@ /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #if defined(CONFIG_OF_FLATTREE) =20 @@ -103,5 +103,5 @@ static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} #endif /* CONFIG_OF_EARLY_FLATTREE */ =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_OF_FDT_H */ diff --git a/include/linux/pe.h b/include/linux/pe.h index cd2b7275385f3..ab45bba90ce82 100644 --- a/include/linux/pe.h +++ b/include/linux/pe.h @@ -240,7 +240,7 @@ #define IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS 20 /* Extended DLL characte= ristics bits */ #define IMAGE_DEBUG_TYPE_PERFMAP 21 /* Location of associated Ready To Ru= n PerfMap file */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct mz_hdr { uint16_t magic; /* MZ_MAGIC */ @@ -546,6 +546,6 @@ struct win_certificate { uint16_t cert_type; }; =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __LINUX_PE_H */ diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 12d90360f6db9..d3103307402fe 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -203,7 +203,7 @@ /* * Accessors and operations. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * __verify_pcpu_ptr() verifies @ptr is a percpu pointer without evaluating @@ -514,5 +514,5 @@ do { \ #define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1) #define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_PERCPU_DEFS_H */ diff --git a/include/linux/pfn.h b/include/linux/pfn.h index b90ca0b6c331e..cfedf0f61bb3c 100644 --- a/include/linux/pfn.h +++ b/include/linux/pfn.h @@ -2,7 +2,7 @@ #ifndef _LINUX_PFN_H_ #define _LINUX_PFN_H_ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif =20 diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index ee3148ef87f60..bdf1cb021f6f9 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -8,7 +8,7 @@ #define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT) #define PUD_ORDER (PUD_SHIFT - PAGE_SHIFT) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_MMU =20 #include @@ -2005,7 +2005,7 @@ static inline const char *pgtable_level_to_str(enum p= gtable_level level) } } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #if !defined(MAX_POSSIBLE_PHYSMEM_BITS) && !defined(CONFIG_64BIT) #ifdef CONFIG_PHYS_ADDR_T_64BIT diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platfo= rm_data/emif_plat.h index b93feef5d586f..ad7f706c124e3 100644 --- a/include/linux/platform_data/emif_plat.h +++ b/include/linux/platform_data/emif_plat.h @@ -39,7 +39,7 @@ #define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL 0x00000002 #define EMIF_CUSTOM_CONFIG_EXTENDED_TEMP_PART 0x00000004 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /** * struct ddr_device_info - All information about the DDR device except AC * timing parameters @@ -121,6 +121,6 @@ struct emif_platform_data { u32 ip_rev; u32 phy_type; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __LINUX_EMIF_H */ diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h index 102aa33d956c4..f54cb6e23f85e 100644 --- a/include/linux/serial_s3c.h +++ b/include/linux/serial_s3c.h @@ -269,7 +269,7 @@ #define APPLE_S5L_UTRSTAT_RXTO BIT(9) #define APPLE_S5L_UTRSTAT_ALL_FLAGS GENMASK(9, 3) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -294,7 +294,7 @@ struct s3c2410_uartcfg { unsigned long ufcon; /* value of ufcon for port */ }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_ARM_REGS_SERIAL_H */ =20 diff --git a/include/linux/static_call_types.h b/include/linux/static_call_= types.h index cfb6ddeb292b6..ac55bc966a56c 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/include/linux/ti-emif-sram.h b/include/linux/ti-emif-sram.h index 441b2988e66a5..b256a9b4ef053 100644 --- a/include/linux/ti-emif-sram.h +++ b/include/linux/ti-emif-sram.h @@ -10,7 +10,7 @@ =20 #include #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 struct emif_regs_amx3 { u32 emif_sdcfg_val; diff --git a/include/linux/types.h b/include/linux/types.h index 6dfdb8e8e4c35..00b44dd5bdfd7 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -5,7 +5,7 @@ #define __EXPORTED_HEADERS__ #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #define DECLARE_BITMAP(name,bits) \ unsigned long name[BITS_TO_LONGS(bits)] @@ -265,5 +265,5 @@ struct rcuwait { struct task_struct __rcu *task; }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_TYPES_H */ diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h index 0bf610acafd06..8c53150acd76e 100644 --- a/include/soc/imx/cpu.h +++ b/include/soc/imx/cpu.h @@ -30,7 +30,7 @@ #define MXC_CPU_VF600 0x600 #define MXC_CPU_VF610 (MXC_CPU_VF600 | MXC_CPU_VFx10) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ extern unsigned int __mxc_cpu_type; #endif =20 diff --git a/include/soc/tegra/flowctrl.h b/include/soc/tegra/flowctrl.h index 1aacc5c7a9dba..2a60bd4934c32 100644 --- a/include/soc/tegra/flowctrl.h +++ b/include/soc/tegra/flowctrl.h @@ -39,7 +39,7 @@ #define TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP (0xF << 4) #define TEGRA30_FLOW_CTRL_CSR_WFI_BITMAP (0xF << 8) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #ifdef CONFIG_SOC_TEGRA_FLOWCTRL u32 flowctrl_read_cpu_csr(unsigned int cpuid); void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value); @@ -67,5 +67,5 @@ static inline void flowctrl_cpu_suspend_exit(unsigned int= cpuid) { } #endif /* CONFIG_SOC_TEGRA_FLOWCTRL */ -#endif /* __ASSEMBLY */ +#endif /* __ASSEMBLER__ */ #endif /* __SOC_TEGRA_FLOWCTRL_H__ */ diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h index 8f421b9f7585c..c4f7a1b97c547 100644 --- a/include/soc/tegra/fuse.h +++ b/include/soc/tegra/fuse.h @@ -24,7 +24,7 @@ #define TEGRA30_FUSE_SATA_CALIB 0x124 #define TEGRA_FUSE_USB_CALIB_EXT_0 0x250 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 enum tegra_revision { TEGRA_REVISION_UNKNOWN =3D 0, @@ -122,6 +122,6 @@ static inline int tegra194_miscreg_mask_serror(void) =20 struct device *tegra_soc_device_register(void); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __SOC_TEGRA_FUSE_H__ */ diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h index 23c39b96190fd..96e6eb0cb7df9 100644 --- a/include/vdso/datapage.h +++ b/include/vdso/datapage.h @@ -2,7 +2,7 @@ #ifndef __VDSO_DATAPAGE_H #define __VDSO_DATAPAGE_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -195,7 +195,7 @@ enum vdso_pages { */ #include =20 -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ =20 #ifdef CONFIG_VDSO_GETRANDOM #define __vdso_u_rng_data PROVIDE(vdso_u_rng_data =3D vdso_u_data + 2 * PA= GE_SIZE); @@ -216,6 +216,6 @@ enum vdso_pages { __vdso_u_arch_data \ =20 =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __VDSO_DATAPAGE_H */ diff --git a/include/vdso/helpers.h b/include/vdso/helpers.h index 1a5ee9d9052c3..20439e6d5fbf0 100644 --- a/include/vdso/helpers.h +++ b/include/vdso/helpers.h @@ -2,7 +2,7 @@ #ifndef __VDSO_HELPERS_H #define __VDSO_HELPERS_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -82,6 +82,6 @@ static __always_inline void vdso_write_end(struct vdso_ti= me_data *vd) vdso_write_seq_end(&vc[CS_RAW]); } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __VDSO_HELPERS_H */ diff --git a/include/vdso/processor.h b/include/vdso/processor.h index fbe8265ea3c49..cc781912a696e 100644 --- a/include/vdso/processor.h +++ b/include/vdso/processor.h @@ -5,10 +5,10 @@ #ifndef __VDSO_PROCESSOR_H #define __VDSO_PROCESSOR_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* __VDSO_PROCESSOR_H */ diff --git a/include/vdso/vsyscall.h b/include/vdso/vsyscall.h index b0fdc9c6bf439..c5c2a2c078571 100644 --- a/include/vdso/vsyscall.h +++ b/include/vdso/vsyscall.h @@ -2,13 +2,13 @@ #ifndef __VDSO_VSYSCALL_H #define __VDSO_VSYSCALL_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 unsigned long vdso_update_begin(void); void vdso_update_end(unsigned long flags); =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __VDSO_VSYSCALL_H */ diff --git a/include/xen/arm/interface.h b/include/xen/arm/interface.h index c3eada2642aa9..61360b89da405 100644 --- a/include/xen/arm/interface.h +++ b/include/xen/arm/interface.h @@ -30,7 +30,7 @@ =20 #define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* Explicitly size integers that represent pfns in the interface with * Xen so that we can have one ABI that works for 32 and 64 bit guests. * Note that this means that the xen_pfn_t type may be capable of diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mc= a.h index 1c9afbe8cc260..8f5815f1d3ab3 100644 --- a/include/xen/interface/xen-mca.h +++ b/include/xen/interface/xen-mca.h @@ -50,7 +50,7 @@ /* OUT: There was no machine check data to fetch. */ #define XEN_MC_NODATA 0x2 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* vIRQ injected to Dom0 */ #define VIRQ_MCA VIRQ_ARCH_0 =20 @@ -388,5 +388,5 @@ struct xen_mce_log { #define MCE_GET_LOG_LEN _IOR('M', 2, int) #define MCE_GETCLEAR_FLAGS _IOR('M', 3, int) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */ diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 0ca23eca2a9cc..40c9793e98805 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -337,7 +337,7 @@ #define MMUEXT_MARK_SUPER 19 #define MMUEXT_UNMARK_SUPER 20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct mmuext_op { unsigned int cmd; union { @@ -415,7 +415,7 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op); =20 #define MAX_VMASST_TYPE 5 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 typedef uint16_t domid_t; =20 @@ -760,11 +760,11 @@ struct tmem_op { =20 DEFINE_GUEST_HANDLE(u64); =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 /* In assembly code we cannot use C numeric constant suffixes. */ #define mk_unsigned_long(x) x =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __XEN_PUBLIC_XEN_H__ */ diff --git a/tools/include/asm-generic/barrier.h b/tools/include/asm-generi= c/barrier.h index 6ef36e920ea8a..b61c3bde0447e 100644 --- a/tools/include/asm-generic/barrier.h +++ b/tools/include/asm-generic/barrier.h @@ -13,7 +13,7 @@ #ifndef __TOOLS_LINUX_ASM_GENERIC_BARRIER_H #define __TOOLS_LINUX_ASM_GENERIC_BARRIER_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -36,5 +36,5 @@ #define wmb() mb() #endif =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __TOOLS_LINUX_ASM_GENERIC_BARRIER_H */ diff --git a/tools/include/asm/alternative.h b/tools/include/asm/alternativ= e.h index 8e548ac8f740c..85db65074a714 100644 --- a/tools/include/asm/alternative.h +++ b/tools/include/asm/alternative.h @@ -3,7 +3,7 @@ #define _TOOLS_ASM_ALTERNATIVE_ASM_H =20 #if defined(__s390x__) -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .macro ALTERNATIVE oldinstr, newinstr, feature \oldinstr .endm diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h index a40cc861b3a7c..b7509f15718e6 100644 --- a/tools/include/linux/bits.h +++ b/tools/include/linux/bits.h @@ -17,7 +17,7 @@ * position @h. For example * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. */ -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__) =20 /* * Missing asm support @@ -75,7 +75,7 @@ #define BIT_U32(nr) BIT_TYPE(u32, nr) #define BIT_U64(nr) BIT_TYPE(u64, nr) =20 -#else /* defined(__ASSEMBLY__) */ +#else /* defined(__ASSEMBLER__) */ =20 /* * BUILD_BUG_ON_ZERO is not available in h files included from asm files, @@ -84,6 +84,6 @@ #define GENMASK(h, l) __GENMASK(h, l) #define GENMASK_ULL(h, l) __GENMASK_ULL(h, l) =20 -#endif /* !defined(__ASSEMBLY__) */ +#endif /* !defined(__ASSEMBLER__) */ =20 #endif /* __LINUX_BITS_H */ diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_type= s.h index a86af9bc8bdc4..b17614c493e4c 100644 --- a/tools/include/linux/cfi_types.h +++ b/tools/include/linux/cfi_types.h @@ -5,7 +5,7 @@ #ifndef _LINUX_CFI_TYPES_H #define _LINUX_CFI_TYPES_H =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #include =20 #ifdef CONFIG_CFI @@ -41,7 +41,7 @@ SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) #endif =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 #ifdef CONFIG_CFI #define DEFINE_CFI_TYPE(name, func) \ @@ -64,5 +64,5 @@ ); #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _LINUX_CFI_TYPES_H */ diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h index f40bd2b04c298..45b2405de8967 100644 --- a/tools/include/linux/compiler.h +++ b/tools/include/linux/compiler.h @@ -2,7 +2,7 @@ #ifndef _TOOLS_LINUX_COMPILER_H_ #define _TOOLS_LINUX_COMPILER_H_ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -256,6 +256,6 @@ static __always_inline void __write_once_size(volatile = void *p, void *res, int s #endif #endif =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _TOOLS_LINUX_COMPILER_H */ diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objt= ool_types.h index c6def4049b1ae..c24e9ea392696 100644 --- a/tools/include/linux/objtool_types.h +++ b/tools/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 diff --git a/tools/include/linux/static_call_types.h b/tools/include/linux/= static_call_types.h index cfb6ddeb292b6..ac55bc966a56c 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 */ --=20 2.51.1 From nobody Tue Dec 2 01:33:06 2025 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 6D9C134D382 for ; Fri, 21 Nov 2025 10:01:37 +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=1763719299; cv=none; b=TjwDb1mYNy8SURNHJ4gs9z8R8uDqqWqknY+ZqHoYPn5Y8AePq54rV8j/AG2oNDkxRK0nEfkz9iWVYTbkL2tjPLYgVquHzZabbG47nidneagaCdUaef52ox88BHTiRbxuz4RxWVlZdDF/kHRTCS7I5A3Un1Vj9AcVMUmeF6qqy1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719299; c=relaxed/simple; bh=9/Ql+dAsUXEs4tc/9oTf/8u6Gf7/hz+bXrR8WKKb1cA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qnuvOuQJxZxvvNZJUmuSqMJ+in/xQvxXFhYw/0qOA9dDz1kRYQoc3UvugKD/NXCKg+4KVR/6QT1NKwYD9/yKVUMSfwiQ0YOjK04M223qfoKDY5VZSrbAlMux5dHQvQ7W3lutbDd+pWZ8XkXFLm/x56LOkAIYpR1tB4RDrh264a4= 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=ebk9NsO6; 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="ebk9NsO6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719296; 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=HzjekNmgRaAQ18lyWUzsEgEEJcD+Pamj+FUs+1j6mw8=; b=ebk9NsO6KsMHZdTPCBlbDOS4GilXwLDzrgqFtdtkf8usI/xq2jAl0k77mtnDzWbEl2BItl Vl9Bq9Lu+oP5vVv6LrsQIPruXR1ykW3eSEYFiI3fDAf+umQYhxfMoUSyPbY+kKTPpx1rBS DzEA7Ce7SgPl1wCiI+AE5akAEhjQkS8= Received: from mx-prod-mc-01.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-147-KhGOA54LO2idn1_FQ3SIiw-1; Fri, 21 Nov 2025 05:01:27 -0500 X-MC-Unique: KhGOA54LO2idn1_FQ3SIiw-1 X-Mimecast-MFC-AGG-ID: KhGOA54LO2idn1_FQ3SIiw_1763719284 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A83221954B1B; Fri, 21 Nov 2025 10:01:24 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9142E1955F66; Fri, 21 Nov 2025 10:01:22 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth Subject: [PATCH v4 8/9] x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__ Date: Fri, 21 Nov 2025 11:00:43 +0100 Message-ID: <20251121100044.282684-9-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth After converting the __ASSEMBLY__ statements to __ASSEMBLER__ in commit 24a295e4ef1ca ("x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers"), some new code has been added that uses __ASSEMBLY__ again. Convert these stragglers, too. This is a mechanical patch, done with a simple "sed -i" command. Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- arch/x86/include/asm/irqflags.h | 4 ++-- arch/x86/include/asm/percpu.h | 2 +- arch/x86/include/asm/runtime-const.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflag= s.h index b30e5474c18e1..5feaac1d235f0 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -77,7 +77,7 @@ static __always_inline void native_local_irq_restore(unsi= gned long flags) #endif =20 #ifndef CONFIG_PARAVIRT -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Used in the idle loop; sti takes one instruction cycle * to complete: @@ -95,7 +95,7 @@ static __always_inline void halt(void) { native_halt(); } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONFIG_PARAVIRT */ =20 #ifdef CONFIG_PARAVIRT_XXL diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 725d0eff7acdf..50f73a8df7f6c 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -20,7 +20,7 @@ =20 #define PER_CPU_VAR(var) __percpu(var)__percpu_rel =20 -#else /* !__ASSEMBLY__: */ +#else /* !__ASSEMBLER__: */ =20 #include #include diff --git a/arch/x86/include/asm/runtime-const.h b/arch/x86/include/asm/ru= ntime-const.h index e5a13dc8816e2..4cd94fdcb45e2 100644 --- a/arch/x86/include/asm/runtime-const.h +++ b/arch/x86/include/asm/runtime-const.h @@ -6,7 +6,7 @@ #error "Cannot use runtime-const infrastructure from modules" #endif =20 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ =20 .macro RUNTIME_CONST_PTR sym reg movq $0x0123456789abcdef, %\reg @@ -16,7 +16,7 @@ .popsection .endm =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 #define runtime_const_ptr(sym) ({ \ typeof(sym) __ret; \ @@ -74,5 +74,5 @@ static inline void runtime_const_fixup(void (*fn)(void *,= unsigned long), } } =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif --=20 2.51.1 From nobody Tue Dec 2 01:33:06 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 529CB34D388 for ; Fri, 21 Nov 2025 10:01:34 +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=1763719296; cv=none; b=Epi7ceGLafic/gS5bupK1x19/++k8YvNlC4rK+B7yM/Dqq/yobs8oEFUUa6RxMw3aHokVYQOXYDmN6dYxK/8Upp1hO8oTbOia1ihpUK6R3rjI6oQGiPJFlFGuzmXjn7Bq+MuOnvCR1a9nRAu1OPv+xyZbA1madI75Wh0QgGDQDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763719296; c=relaxed/simple; bh=PiAEk0s52NxXA70ly+n3b9B4FbztsX9xtdW3LVNxUhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vic0eRAeVTd4sJygwCudHQ5r3h7nDP6Gevc8+wvI+yXSIx9MyHTWXyxiDI3oq+6ufSKrdqH8YPy93WyoCHzYQ/BehxSEzDj9wJVUvPdyVjzOJN1ZezuZ7j9m88rnWa0un1+vOV+TGFwl2539WHzE96ipYNeFbgMnm/CVgkHI8Mo= 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=KPwtVfXQ; arc=none smtp.client-ip=170.10.133.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="KPwtVfXQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763719293; 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=8ShEWZDGVfSWGvaWH66N+yVtRbZoEirjG0NK4KU0DrU=; b=KPwtVfXQJ+QO3K7mLbQMUpakW7X/bFccQnikyq9r6CVk13dUr2B85EBVQ8MzbR1k0o97r9 G61AiYB/OcOxj/WylrfPbeUaH8paE/c256SCWe+30WJSOmi/KWxF+GkgxO9h1cIoTCFt4q l+CeWijYhIOnBAFIDJpEm1mONXO6cFs= 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-490-oIKYxLfKPImfcYbrMPco9A-1; Fri, 21 Nov 2025 05:01:29 -0500 X-MC-Unique: oIKYxLfKPImfcYbrMPco9A-1 X-Mimecast-MFC-AGG-ID: oIKYxLfKPImfcYbrMPco9A_1763719288 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 80A7E195605B; Fri, 21 Nov 2025 10:01:28 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.78]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EFA71955F66; Fri, 21 Nov 2025 10:01:25 +0000 (UTC) From: Thomas Huth To: Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, Thomas Huth Subject: [PATCH v4 9/9] treewide: Stop defining __ASSEMBLY__ for assembler files Date: Fri, 21 Nov 2025 11:00:44 +0100 Message-ID: <20251121100044.282684-10-thuth@redhat.com> In-Reply-To: <20251121100044.282684-1-thuth@redhat.com> References: <20251121100044.282684-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" From: Thomas Huth All spots have been changed to __ASSEMBLER__ (i.e. the macro that gets defined by the compiler), so we don't have to manually define __ASSEMBLY__ now anymore. Signed-off-by: Thomas Huth Acked-by by Brian, but the patches did not get merged yet. --- Makefile | 2 +- arch/arm64/kernel/vdso32/Makefile | 1 - arch/loongarch/vdso/Makefile | 2 +- arch/mips/boot/compressed/Makefile | 2 +- arch/mips/vdso/Makefile | 2 +- arch/powerpc/boot/Makefile | 2 +- arch/powerpc/platforms/cell/spufs/Makefile | 2 +- arch/s390/Makefile | 2 +- arch/x86/boot/Makefile | 2 +- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/realmode/rm/Makefile | 2 +- arch/xtensa/kernel/Makefile | 2 +- drivers/firmware/efi/libstub/Makefile | 2 +- drivers/net/wan/Makefile | 2 +- scripts/Makefile.build | 2 +- scripts/gfp-translate | 2 +- tools/testing/selftests/kvm/lib/riscv/handlers.S | 4 ---- tools/testing/selftests/vDSO/vgetrandom-chacha.S | 2 -- 18 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index d6ee709e45e8b..8e20bd8b1b561 100644 --- a/Makefile +++ b/Makefile @@ -581,7 +581,7 @@ LINUXINCLUDE :=3D \ -I$(objtree)/include \ $(USERINCLUDE) =20 -KBUILD_AFLAGS :=3D -D__ASSEMBLY__ -fno-PIE +KBUILD_AFLAGS :=3D -fno-PIE =20 KBUILD_CFLAGS :=3D KBUILD_CFLAGS +=3D -std=3Dgnu11 diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/M= akefile index 9d0efed91414c..6e6295f5983dc 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -82,7 +82,6 @@ VDSO_CFLAGS +=3D -marm endif =20 VDSO_AFLAGS :=3D $(VDSO_CAFLAGS) -VDSO_AFLAGS +=3D -D__ASSEMBLY__ =20 # From arm vDSO Makefile VDSO_LDFLAGS +=3D -Bsymbolic --no-undefined -soname=3Dlinux-vdso.so.1 diff --git a/arch/loongarch/vdso/Makefile b/arch/loongarch/vdso/Makefile index c0cc3ca5da9f4..a5da5b862a3ec 100644 --- a/arch/loongarch/vdso/Makefile +++ b/arch/loongarch/vdso/Makefile @@ -24,7 +24,7 @@ cflags-vdso :=3D $(ccflags-vdso) \ $(call cc-option, -fno-asynchronous-unwind-tables) \ $(call cc-option, -fno-stack-protector) aflags-vdso :=3D $(ccflags-vdso) \ - -D__ASSEMBLY__ -Wa,-gdwarf-2 + -Wa,-gdwarf-2 =20 ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o +=3D -include $(c-gettimeofday-y) diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed= /Makefile index e0b8ec9a95162..41ec115d4795b 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -30,7 +30,7 @@ endif KBUILD_CFLAGS :=3D $(KBUILD_CFLAGS) -D__KERNEL__ -D__DISABLE_EXPORTS \ -DBOOT_HEAP_SIZE=3D$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=3D$(VMLI= NUX_LOAD_ADDRESS)ull" =20 -KBUILD_AFLAGS :=3D $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ +KBUILD_AFLAGS :=3D $(KBUILD_AFLAGS) \ -DBOOT_HEAP_SIZE=3D$(BOOT_HEAP_SIZE) \ -DKERNEL_ENTRY=3D$(VMLINUX_ENTRY_ADDRESS) =20 diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 69d4593f64fee..d6685a36c6b43 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -33,7 +33,7 @@ cflags-vdso :=3D $(ccflags-vdso) \ -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ $(call cc-option, -fno-asynchronous-unwind-tables) aflags-vdso :=3D $(ccflags-vdso) \ - -D__ASSEMBLY__ -Wa,-gdwarf-2 + -Wa,-gdwarf-2 =20 ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o =3D -include $(c-gettimeofday-y) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index f1a4761ebd44b..5a75d4fd468cb 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -80,7 +80,7 @@ BOOTCFLAGS :=3D $(BOOTTARGETFLAGS) \ $(call cc-option,-mno-spe) $(call cc-option,-mspe=3Dno) \ -fomit-frame-pointer -fno-builtin -fPIC =20 -BOOTAFLAGS :=3D $(BOOTTARGETFLAGS) -D__ASSEMBLY__ +BOOTAFLAGS :=3D $(BOOTTARGETFLAGS) =20 BOOTARFLAGS :=3D -crD =20 diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/plat= forms/cell/spufs/Makefile index 52e4c80ec8d03..c13928aea20c6 100644 --- a/arch/powerpc/platforms/cell/spufs/Makefile +++ b/arch/powerpc/platforms/cell/spufs/Makefile @@ -16,7 +16,7 @@ SPU_AS :=3D $(SPU_CROSS)gcc SPU_LD :=3D $(SPU_CROSS)ld SPU_OBJCOPY :=3D $(SPU_CROSS)objcopy SPU_CFLAGS :=3D -O2 -Wall -I$(srctree)/include -D__KERNEL__ -SPU_AFLAGS :=3D -c -D__ASSEMBLY__ -I$(srctree)/include -D__KERNEL__ +SPU_AFLAGS :=3D -c -I$(srctree)/include -D__KERNEL__ SPU_LDFLAGS :=3D -N -Ttext=3D0x0 =20 $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 3005f5459f81b..da00d6953efae 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -18,7 +18,7 @@ KBUILD_CFLAGS +=3D -fPIC LDFLAGS_vmlinux :=3D $(call ld-option,-no-pie) extra_tools :=3D relocs aflags_dwarf :=3D -Wa,-gdwarf-2 -KBUILD_AFLAGS_DECOMPRESSOR :=3D $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ +KBUILD_AFLAGS_DECOMPRESSOR :=3D $(CLANG_FLAGS) -m64 ifndef CONFIG_AS_IS_LLVM KBUILD_AFLAGS_DECOMPRESSOR +=3D $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf)) endif diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 3f9fb3698d669..b343ef5ee9951 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -52,7 +52,7 @@ targets +=3D cpustr.h # ------------------------------------------------------------------------= --- =20 KBUILD_CFLAGS :=3D $(REALMODE_CFLAGS) -D_SETUP -KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ +KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) KBUILD_CFLAGS +=3D -fno-asynchronous-unwind-tables KBUILD_CFLAGS +=3D $(CONFIG_CC_IMPLICIT_FALLTHROUGH) =20 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/M= akefile index 68f9d7a1683b5..91c68ab20588d 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -52,7 +52,7 @@ KBUILD_CFLAGS +=3D -include $(srctree)/include/linux/hidd= en.h # that the compiler finds it even with out-of-tree builds (make O=3D/some/= path). CFLAGS_sev-handle-vc.o +=3D -I$(objtree)/arch/x86/lib/ =20 -KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ +KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) =20 KBUILD_LDFLAGS :=3D -m elf_$(UTS_MACHINE) KBUILD_LDFLAGS +=3D $(call ld-option,--no-ld-generated-unwind-info) diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index a0fb39abc5c86..20bbe1af05acd 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile @@ -65,5 +65,5 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE =20 KBUILD_CFLAGS :=3D $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \ -I$(srctree)/arch/x86/boot -KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ +KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) KBUILD_CFLAGS +=3D -fno-asynchronous-unwind-tables diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index d3ef0407401f6..ece4ae6dea97d 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile @@ -39,7 +39,7 @@ sed-y =3D -e ':a; s/\*(\([^)]*\)\.text\.unlikely/*(\1.lit= eral.unlikely .{text}.unl -e 's/\.{text}/.text/g' =20 quiet_cmd__cpp_lds_S =3D LDS $@ -cmd__cpp_lds_S =3D $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ \ +cmd__cpp_lds_S =3D $(CPP) $(cpp_flags) -P -C -Uxtensa \ -DLINKER_SCRIPT $< | sed $(sed-y) >$@ =20 $(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/l= ibstub/Makefile index 7d15a85d579fa..054051c685dd2 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -62,7 +62,7 @@ KBUILD_CFLAGS :=3D $(filter-out $(CC_FLAGS_LTO), $(KBUILD= _CFLAGS)) # `-fdata-sections` flag from KBUILD_CFLAGS_KERNEL KBUILD_CFLAGS_KERNEL :=3D $(filter-out -fdata-sections, $(KBUILD_CFLAGS_KE= RNEL)) =20 -KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ +KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) =20 lib-y :=3D efi-stub-helper.o gop.o secureboot.o tpm.o \ file.o mem.o random.o randomalloc.o pci.o \ diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 00e9b7ee1e012..4233143534465 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -57,7 +57,7 @@ $(obj)/wanxlfw.bin: $(obj)/wanxlfw.o FORCE $(call if_changed,m68kld_bin_o) =20 quiet_cmd_m68kas_o_S =3D M68KAS $@ - cmd_m68kas_o_S =3D $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(s= rctree)/include/uapi -c -o $@ $< + cmd_m68kas_o_S =3D $(M68KCC) -Wp,-MD,$(depfile) -I$(srctree)/include= /uapi -c -o $@ $< =20 $(obj)/wanxlfw.o: $(src)/wanxlfw.S FORCE $(call if_changed_dep,m68kas_o_S) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 52c08c4eb0b9a..09f0142a93656 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -437,7 +437,7 @@ targets +=3D $(lib-y) $(always-y) # ------------------------------------------------------------------------= --- quiet_cmd_cpp_lds_S =3D LDS $@ cmd_cpp_lds_S =3D $(CPP) $(cpp_flags) -P -U$(ARCH) \ - -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< + -DLINKER_SCRIPT -o $@ $< =20 $(obj)/%.lds: $(src)/%.lds.S FORCE $(call if_changed_dep,cpp_lds_S) diff --git a/scripts/gfp-translate b/scripts/gfp-translate index 8385ae0d5af93..f6353795fdca3 100755 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate @@ -73,7 +73,7 @@ echo Parsing: $GFPMASK #include =20 // Try to fool compiler.h into not including extra stuff -#define __ASSEMBLY__ 1 +#define __ASSEMBLER__ 1 =20 #include #include diff --git a/tools/testing/selftests/kvm/lib/riscv/handlers.S b/tools/testi= ng/selftests/kvm/lib/riscv/handlers.S index b787b982e922a..c8cc2d695f483 100644 --- a/tools/testing/selftests/kvm/lib/riscv/handlers.S +++ b/tools/testing/selftests/kvm/lib/riscv/handlers.S @@ -3,10 +3,6 @@ * Copyright (c) 2023 Intel Corporation */ =20 -#ifndef __ASSEMBLY__ -#define __ASSEMBLY__ -#endif - #include =20 .macro save_context diff --git a/tools/testing/selftests/vDSO/vgetrandom-chacha.S b/tools/testi= ng/selftests/vDSO/vgetrandom-chacha.S index a4a82e1c28a90..cba930f1d0907 100644 --- a/tools/testing/selftests/vDSO/vgetrandom-chacha.S +++ b/tools/testing/selftests/vDSO/vgetrandom-chacha.S @@ -3,8 +3,6 @@ * Copyright (C) 2024 Jason A. Donenfeld . All Rights Res= erved. */ =20 -#define __ASSEMBLY__ - #if defined(__aarch64__) #include "../../../../arch/arm64/kernel/vdso/vgetrandom-chacha.S" #elif defined(__loongarch__) --=20 2.51.1