diff options
author | Daniel Kiper <daniel.kiper@oracle.com> | 2019-11-12 14:46:39 +0100 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-11-12 16:16:54 +0100 |
commit | 00cd1c154d565c62ad5e065bf3530f68bdf59490 (patch) | |
tree | 110d37ffd112b0c703103716dad76bdbe5c48dac /arch/x86/boot/compressed/kernel_info.S | |
parent | 2c33c27fd6033ced942c9a591b8ac15c07c57d70 (diff) | |
download | linux-stable-00cd1c154d565c62ad5e065bf3530f68bdf59490.tar.gz linux-stable-00cd1c154d565c62ad5e065bf3530f68bdf59490.tar.bz2 linux-stable-00cd1c154d565c62ad5e065bf3530f68bdf59490.zip |
x86/boot: Introduce kernel_info.setup_type_max
This field contains maximal allowed type for setup_data.
Do not bump setup_header version in arch/x86/boot/header.S because it
will be followed by additional changes coming into the Linux/x86 boot
protocol.
Suggested-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: ard.biesheuvel@linaro.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: dave.hansen@linux.intel.com
Cc: eric.snowberg@oracle.com
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Juergen Gross <jgross@suse.com>
Cc: kanth.ghatraju@oracle.com
Cc: linux-doc@vger.kernel.org
Cc: linux-efi <linux-efi@vger.kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: rdunlap@infradead.org
Cc: ross.philipson@oracle.com
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Cc: xen-devel@lists.xenproject.org
Link: https://lkml.kernel.org/r/20191112134640.16035-3-daniel.kiper@oracle.com
Diffstat (limited to 'arch/x86/boot/compressed/kernel_info.S')
-rw-r--r-- | arch/x86/boot/compressed/kernel_info.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/kernel_info.S b/arch/x86/boot/compressed/kernel_info.S index 8ea6f6e3feef..018dacbd753e 100644 --- a/arch/x86/boot/compressed/kernel_info.S +++ b/arch/x86/boot/compressed/kernel_info.S @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/bootparam.h> + .section ".rodata.kernel_info", "a" .global kernel_info @@ -12,6 +14,9 @@ kernel_info: /* Size total. */ .long kernel_info_end - kernel_info + /* Maximal allowed type for setup_data. */ + .long SETUP_TYPE_MAX + kernel_info_var_len_data: /* Empty for time being... */ kernel_info_end: |