Commit d69ad12c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-build-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 build updates from Ingo Molnar:

 - Reduce <asm/bootparam.h> dependencies

 - Simplify <asm/efi.h>

 - Unify *_setup_data definitions into <asm/setup_data.h>

 - Reduce the size of <asm/bootparam.h>

* tag 'x86-build-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Do not include <asm/bootparam.h> in several files
  x86/efi: Implement arch_ima_efi_boot_mode() in source file
  x86/setup: Move internal setup_data structures into setup_data.h
  x86/setup: Move UAPI setup structures into setup_data.h
parents 73f0d1d7 103bf75f

arch/x86/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ REALMODE_CFLAGS += -fno-stack-protector 
REALMODE_CFLAGS += -Wno-address-of-packed-member

REALMODE_CFLAGS += $(cc_stack_align4)

REALMODE_CFLAGS += $(CLANG_FLAGS)

ifdef CONFIG_CC_IS_CLANG

REALMODE_CFLAGS += -Wno-gnu

endif

export REALMODE_CFLAGS



# BITS is used as extension for files which are available in a 32 bit

arch/x86/boot/compressed/acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include "../string.h"

#include "efi.h"



#include <asm/bootparam.h>



#include <linux/numa.h>



/*

arch/x86/boot/compressed/cmdline.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "misc.h"



#include <asm/bootparam.h>



static unsigned long fs;

static inline void set_fs(unsigned long seg)

{

arch/x86/boot/compressed/efi.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


#include "misc.h"



#include <asm/bootparam.h>



/**

 * efi_get_type - Given a pointer to boot_params, determine the type of EFI environment.

 *

arch/x86/boot/compressed/efi.h

+0 −9
Original line number Diff line number Diff line
@@ -97,15 +97,6 @@ typedef struct { 
	u32 tables;

} efi_system_table_32_t;



/* kexec external ABI */

struct efi_setup_data {

	u64 fw_vendor;

	u64 __unused;

	u64 tables;

	u64 smbios;

	u64 reserved[8];

};



struct efi_unaccepted_memory {

	u32 version;

	u32 unit_size;