diff options
author | Borislav Petkov <bp@suse.de> | 2022-07-11 09:58:01 +0200 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2022-07-11 09:58:01 +0200 |
commit | 5a88c48f4146de2c8c2ed7ddcaa76f898869f3a3 (patch) | |
tree | fc501a1b940026cbd5316f8665236c109d5f1a2e /arch/x86/include | |
parent | x86/kexec: Carry forward IMA measurement log on kexec (diff) | |
parent | Linux 5.19-rc6 (diff) | |
download | linux-dev-5a88c48f4146de2c8c2ed7ddcaa76f898869f3a3.tar.xz linux-dev-5a88c48f4146de2c8c2ed7ddcaa76f898869f3a3.zip |
Merge tag 'v5.19-rc6' into tip:x86/kdump
Merge rc6 to pick up dependent changes to the bootparam UAPI header.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/x86/include/uapi/asm/bootparam.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index f8b9ee97a891..f37cbff7354c 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -120,6 +120,9 @@ void *extend_brk(size_t size, size_t align); static char __brk_##name[size] extern void probe_roms(void); + +void clear_bss(void); + #ifdef __i386__ asmlinkage void __init i386_start_kernel(void); diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index ca0796ac4403..be2b9ce52c76 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -16,7 +16,7 @@ #define SETUP_INDIRECT (1<<31) /* SETUP_INDIRECT | max(SETUP_*) */ -#define SETUP_TYPE_MAX (SETUP_INDIRECT | SETUP_JAILHOUSE) +#define SETUP_TYPE_MAX (SETUP_INDIRECT | SETUP_CC_BLOB) /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF |