The following commit has been merged into the x86/boot branch of tip:
Commit-ID: 46f3e7d394b23e93d274590d7bede5d62d80440b
Gitweb: https://git.kernel.org/tip/46f3e7d394b23e93d274590d7bede5d62d80440b
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 15 May 2025 14:05:35 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 14 Dec 2025 09:19:40 +01:00
x86/boot/e820: Change struct e820_table::nr_entries type from __u32 to u32
__u32 is for UAPI headers, and this definition is the only place
in the kernel-internal E820 code that uses __u32. Change it to u32.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H . Peter Anvin <hpa@zytor.com>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Paul Menzel <pmenzel@molgen.mpg.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://patch.msgid.link/20250515120549.2820541-20-mingo@kernel.org
---
arch/x86/include/asm/e820/types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h
index 80c4a72..df12f7e 100644
--- a/arch/x86/include/asm/e820/types.h
+++ b/arch/x86/include/asm/e820/types.h
@@ -83,7 +83,7 @@ struct e820_entry {
* The whole array of E820 entries:
*/
struct e820_table {
- __u32 nr_entries;
+ u32 nr_entries;
struct e820_entry entries[E820_MAX_ENTRIES];
};