From nobody Thu Dec 18 07:30:12 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 039451624E8 for ; Fri, 14 Mar 2025 07:10:51 +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=1741936253; cv=none; b=YEvNYZ7WV18tpLsfSvHcOSCzlG6pc4xk4H6oAklTMK/J/3ysBO6IwydPcsSw248tcS0U6h7u2g0MOamzsjT0TtE87M0xN+CB7LLLGhSZwu3gdArM21k+TKtMWb5TWzWvfrWovI1hChaIr30lzeiPghqXOIT7ADhtxTG5AX02wuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741936253; c=relaxed/simple; bh=OdduD8QSG1xOkPTD3j8qzTiY9mvPoBO3gEJheiHgrik=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JPXYO5SBacz9vZ2Uo2zhzIxsz/JUq6+upV+Me21pL+nzQNCElXLbU8p1FONzyiPdNLu9zjp07j8OBw2F0FjB7zzQJXDHck5E3slJwocp558niZR9YahZEhWalPEaLzajmIbeN6OnT7bP3sjGOvvKe/sBeUtjPvIn8e1B7qtMD68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BuWPNGkr; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BuWPNGkr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741936250; 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=KJMF2S80j4N2JEhusaXzar9nZ6KOLkUaFI2GrWAbcp0=; b=BuWPNGkr7n+3SLP2L5bPMuVQyBF/y0JK0Q/zFYG810Hsr1nQBUF3wXVHpEAIYa7O1CMlPX yZoIQwiDmIz36xQzZUpJ2JS/6OF5y2lSbOWeKINIXiW00X8E234b6z0zwx3wUQYN38VXhN IbsOgJdjTq5F7kqvJyTjnflCUrHZOEY= 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-675-OZAWj1JCOn6go3cn9jiAbg-1; Fri, 14 Mar 2025 03:10:49 -0400 X-MC-Unique: OZAWj1JCOn6go3cn9jiAbg-1 X-Mimecast-MFC-AGG-ID: OZAWj1JCOn6go3cn9jiAbg_1741936248 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2FC07180036E; Fri, 14 Mar 2025 07:10:48 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1219218001D4; Fri, 14 Mar 2025 07:10:43 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-arch@vger.kernel.org, Thomas Huth , Richard Henderson , Matt Turner , linux-alpha@vger.kernel.org Subject: [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers Date: Fri, 14 Mar 2025 08:09:34 +0100 Message-ID: <20250314071013.1575167-4-thuth@redhat.com> In-Reply-To: <20250314071013.1575167-1-thuth@redhat.com> References: <20250314071013.1575167-1-thuth@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembly code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This can be very confusing when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's standardize on the __ASSEMBLER__ macro that is provided by the compilers now. This is a completely mechanical patch (done with a simple "sed -i" statement). Cc: Richard Henderson Cc: Matt Turner Cc: linux-alpha@vger.kernel.org Signed-off-by: Thomas Huth --- 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.48.1