From nobody Wed Dec 17 07:27:13 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1A923010C; Wed, 19 Mar 2025 11:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382208; cv=none; b=HKgwhCfWYE1wJ2P3Ynv24UbebllwXfswaLNjQcESAqoqChF/k6cxbeP9+6aSveReeiczA8x5mtuVWxgHipbKcyiEguRmAdteed6YijDGtY0vCUy1zmNvRBMk/nsxDV7cAX4wGJCpbb5NdTyt7SsnFOZoDCIkF7DazbFUZIxZ+i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382208; c=relaxed/simple; bh=2AOOHqK79y2WwKblkHRlM46fvwLQWxMy8qoL3u2mSfk=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=b9PenvT2+RJqXBhrBnGbxpqTa0JZisTyJ0ISPjyyvd7pzXMsjKTqzILE5FSxSVwsT36+IcMO/AgFa/qqi1i1DpDgSC7sZw364joSaKCa5VVZCcAbAf5mcbOkbGX7mJaXGLYraJxAVjBOn3xOfaK35rwtCTWrgyEZowDcD0kuuUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OPS24bQY; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=4kGiPJdK; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OPS24bQY"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="4kGiPJdK" Date: Wed, 19 Mar 2025 11:03:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1742382205; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVQfKydWdlEqr4TXeRwNAvn4ESNxT9Q6EATCyzbviX8=; b=OPS24bQYvqHRN4ih5c63ISo8FKp9e0hBrzx9KzLaTWoZNg6+69xKtaVywoTNqAIY/ORxyP 79FZQdJYAkevQh847S6kakGgCrL9Z9BEP9YyviwQYWUM93waoVpq2BgBsDqdYlhfbCbFUr lmR8s2UwWG37sxMYrwzmV+ypQBIAsg9OMvYW/762sH1cD+xzBeIFMYxhs1foKlc3soztSp CoGtDbyd4L5jLqqTIleuDQ+1NsDptnIKed1aXiW8gqNr22Z3hoU2VHUA9W6o6BDyZ/jmdS OhJuTX49INZu42c2CotYWm6mkcaDDX05zdEb7GGz7Z9ak90L6VzLmSY8cMxDaQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1742382205; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVQfKydWdlEqr4TXeRwNAvn4ESNxT9Q6EATCyzbviX8=; b=4kGiPJdKk0aUYzsWTjRFBlkbcvi+x6QEJNyGZvjqp6hHCp4Ide0rEG1NMsJrunBHVEsEXE PLiPYC8QVzrMoSCg== From: "tip-bot2 for Thomas Huth" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers Cc: Thomas Huth , Ingo Molnar , "H. Peter Anvin" , Linus Torvalds , Kees Cook , Brian Gerst , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250310104256.123527-1-thuth@redhat.com> References: <20250310104256.123527-1-thuth@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174238220444.14745.16563420428621732058.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/core branch of tip: Commit-ID: 8a141be3233af7d4f7014ebc44d5452d46b2b1be Gitweb: https://git.kernel.org/tip/8a141be3233af7d4f7014ebc44d5452d4= 6b2b1be Author: Thomas Huth AuthorDate: Mon, 10 Mar 2025 11:42:56 +01:00 Committer: Ingo Molnar CommitterDate: Wed, 19 Mar 2025 11:30:53 +01:00 x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in UAPI headers __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. Signed-off-by: Thomas Huth Signed-off-by: Ingo Molnar Cc: "H. Peter Anvin" Cc: Linus Torvalds Cc: Kees Cook Cc: Brian Gerst Link: https://lore.kernel.org/r/20250310104256.123527-1-thuth@redhat.com --- arch/x86/include/uapi/asm/bootparam.h | 4 ++-- arch/x86/include/uapi/asm/e820.h | 4 ++-- arch/x86/include/uapi/asm/ldt.h | 4 ++-- arch/x86/include/uapi/asm/msr.h | 4 ++-- arch/x86/include/uapi/asm/ptrace-abi.h | 6 +++--- arch/x86/include/uapi/asm/ptrace.h | 4 ++-- arch/x86/include/uapi/asm/setup_data.h | 4 ++-- arch/x86/include/uapi/asm/signal.h | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/= asm/bootparam.h index 9b82eeb..dafbf58 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -26,7 +26,7 @@ #define XLF_5LEVEL_ENABLED (1<<6) #define XLF_MEM_ENCRYPTION (1<<7) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -210,6 +210,6 @@ enum x86_hardware_subarch { X86_NR_SUBARCHS, }; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _ASM_X86_BOOTPARAM_H */ diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e= 820.h index 2f491ef..55bc668 100644 --- a/arch/x86/include/uapi/asm/e820.h +++ b/arch/x86/include/uapi/asm/e820.h @@ -54,7 +54,7 @@ */ #define E820_RESERVED_KERN 128 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include struct e820entry { __u64 addr; /* start of memory segment */ @@ -76,7 +76,7 @@ struct e820map { #define BIOS_ROM_BASE 0xffe00000 #define BIOS_ROM_END 0xffffffff =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 =20 #endif /* _UAPI_ASM_X86_E820_H */ diff --git a/arch/x86/include/uapi/asm/ldt.h b/arch/x86/include/uapi/asm/ld= t.h index d62ac5d..a82c039 100644 --- a/arch/x86/include/uapi/asm/ldt.h +++ b/arch/x86/include/uapi/asm/ldt.h @@ -12,7 +12,7 @@ /* The size of each LDT entry. */ #define LDT_ENTRY_SIZE 8 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Note on 64bit base and limit is ignored and you cannot set DS/ES/CS * not to the default values if you still want to do syscalls. This @@ -44,5 +44,5 @@ struct user_desc { #define MODIFY_LDT_CONTENTS_STACK 1 #define MODIFY_LDT_CONTENTS_CODE 2 =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_X86_LDT_H */ diff --git a/arch/x86/include/uapi/asm/msr.h b/arch/x86/include/uapi/asm/ms= r.h index e7516b4..4b8917c 100644 --- a/arch/x86/include/uapi/asm/msr.h +++ b/arch/x86/include/uapi/asm/msr.h @@ -2,7 +2,7 @@ #ifndef _UAPI_ASM_X86_MSR_H #define _UAPI_ASM_X86_MSR_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -10,5 +10,5 @@ #define X86_IOC_RDMSR_REGS _IOWR('c', 0xA0, __u32[8]) #define X86_IOC_WRMSR_REGS _IOWR('c', 0xA1, __u32[8]) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_X86_MSR_H */ diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi= /asm/ptrace-abi.h index 16074b9..5823584 100644 --- a/arch/x86/include/uapi/asm/ptrace-abi.h +++ b/arch/x86/include/uapi/asm/ptrace-abi.h @@ -25,7 +25,7 @@ =20 #else /* __i386__ */ =20 -#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS) +#if defined(__ASSEMBLER__) || defined(__FRAME_OFFSETS) /* * C ABI says these regs are callee-preserved. They aren't saved on kernel= entry * unless syscall needs a complete, fully filled "struct pt_regs". @@ -57,7 +57,7 @@ #define EFLAGS 144 #define RSP 152 #define SS 160 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 /* top of stack page */ #define FRAME_SIZE 168 @@ -87,7 +87,7 @@ =20 #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif =20 diff --git a/arch/x86/include/uapi/asm/ptrace.h b/arch/x86/include/uapi/asm= /ptrace.h index 85165c0..e0b5b4f 100644 --- a/arch/x86/include/uapi/asm/ptrace.h +++ b/arch/x86/include/uapi/asm/ptrace.h @@ -7,7 +7,7 @@ #include =20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #ifdef __i386__ /* this struct defines the way the registers are stored on the @@ -81,6 +81,6 @@ struct pt_regs { =20 =20 =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* _UAPI_ASM_X86_PTRACE_H */ diff --git a/arch/x86/include/uapi/asm/setup_data.h b/arch/x86/include/uapi= /asm/setup_data.h index b111b0c..50c45ea 100644 --- a/arch/x86/include/uapi/asm/setup_data.h +++ b/arch/x86/include/uapi/asm/setup_data.h @@ -18,7 +18,7 @@ #define SETUP_INDIRECT (1<<31) #define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT) =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include =20 @@ -78,6 +78,6 @@ struct ima_setup_data { __u64 size; } __attribute__((packed)); =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _UAPI_ASM_X86_SETUP_DATA_H */ diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm= /signal.h index f777346..1067efa 100644 --- a/arch/x86/include/uapi/asm/signal.h +++ b/arch/x86/include/uapi/asm/signal.h @@ -2,7 +2,7 @@ #ifndef _UAPI_ASM_X86_SIGNAL_H #define _UAPI_ASM_X86_SIGNAL_H =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include =20 @@ -16,7 +16,7 @@ struct siginfo; typedef unsigned long sigset_t; =20 #endif /* __KERNEL__ */ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 =20 #define SIGHUP 1 @@ -68,7 +68,7 @@ typedef unsigned long sigset_t; =20 #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 =20 # ifndef __KERNEL__ @@ -106,6 +106,6 @@ typedef struct sigaltstack { __kernel_size_t ss_size; } stack_t; =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ =20 #endif /* _UAPI_ASM_X86_SIGNAL_H */