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

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Thomas Gleixner:
 "A set of x86 specific fixes and updates:

   - The CR2 corruption fixes which store CR2 early in the entry code
     and hand the stored address to the fault handlers.

   - Revert a forgotten leftover of the dropped FSGSBASE series.

   - Plug a memory leak in the boot code.

   - Make the Hyper-V assist functionality robust by zeroing the shadow
     page.

   - Remove a useless check for dead processes with LDT

   - Update paravirt and VMware maintainers entries.

   - A few cleanup patches addressing various compiler warnings"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry/64: Prevent clobbering of saved CR2 value
  x86/hyper-v: Zero out the VP ASSIST PAGE on allocation
  x86, boot: Remove multiple copy of static function sanitize_boot_params()
  x86/boot/compressed/64: Remove unused variable
  x86/boot/efi: Remove unused variables
  x86/mm, tracing: Fix CR2 corruption
  x86/entry/64: Update comments and sanity tests for create_gap
  x86/entry/64: Simplify idtentry a little
  x86/entry/32: Simplify common_exception
  x86/paravirt: Make read_cr2() CALLEE_SAVE
  MAINTAINERS: Update PARAVIRT_OPS_INTERFACE and VMWARE_HYPERVISOR_INTERFACE
  x86/process: Delete useless check for dead process with LDT
  x86: math-emu: Hide clang warnings for 16-bit overflow
  x86/e820: Use proper booleans instead of 0/1
  x86/apic: Silence -Wtype-limits compiler warnings
  x86/mm: Free sme_early_buffer after init
  x86/boot: Fix memory leak in default_get_smp_config()
  Revert "x86/ptrace: Prevent ptrace from clearing the FS/GS selector" and fix the test
parents 46f5c0cc 6879298b

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -12133,7 +12133,8 @@ F: Documentation/driver-api/parport*.rst 


PARAVIRT_OPS INTERFACE

M:	Juergen Gross <jgross@suse.com>

M:	Alok Kataria <akataria@vmware.com>

M:	Thomas Hellstrom <thellstrom@vmware.com>

M:	"VMware, Inc." <pv-drivers@vmware.com>

L:	virtualization@lists.linux-foundation.org

S:	Supported

F:	Documentation/virtual/paravirt_ops.txt
@@ -17179,7 +17180,8 @@ S: Maintained 
F:	drivers/misc/vmw_balloon.c



VMWARE HYPERVISOR INTERFACE

M:	Alok Kataria <akataria@vmware.com>

M:	Thomas Hellstrom <thellstrom@vmware.com>

M:	"VMware, Inc." <pv-drivers@vmware.com>

L:	virtualization@lists.linux-foundation.org

S:	Supported

F:	arch/x86/kernel/cpu/vmware.c

arch/x86/boot/compressed/eboot.c

+1 −9
Original line number Diff line number Diff line
@@ -384,14 +384,11 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	struct apm_bios_info *bi;

	struct setup_header *hdr;

	efi_loaded_image_t *image;

	void *options, *handle;

	void *handle;

	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;

	int options_size = 0;

	efi_status_t status;

	char *cmdline_ptr;

	u16 *s2;

	u8 *s1;

	int i;

	unsigned long ramdisk_addr;

	unsigned long ramdisk_size;
@@ -494,8 +491,6 @@ static void add_e820ext(struct boot_params *params, 
			struct setup_data *e820ext, u32 nr_entries)

{

	struct setup_data *data;

	efi_status_t status;

	unsigned long size;



	e820ext->type = SETUP_E820_EXT;

	e820ext->len  = nr_entries * sizeof(struct boot_e820_entry);
@@ -677,8 +672,6 @@ static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, 
				   void *priv)

{

	const char *signature;

	__u32 nr_desc;

	efi_status_t status;

	struct exit_boot_struct *p = priv;



	signature = efi_is_64bit() ? EFI64_LOADER_SIGNATURE
@@ -747,7 +740,6 @@ struct boot_params * 
efi_main(struct efi_config *c, struct boot_params *boot_params)

{

	struct desc_ptr *gdt = NULL;

	efi_loaded_image_t *image;

	struct setup_header *hdr = &boot_params->hdr;

	efi_status_t status;

	struct desc_struct *desc;

arch/x86/boot/compressed/misc.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "pgtable.h"

#include "../string.h"

#include "../voffset.h"

#include <asm/bootparam_utils.h>



/*

 * WARNING!!

arch/x86/boot/compressed/misc.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <asm/page.h>

#include <asm/boot.h>

#include <asm/bootparam.h>

#include <asm/bootparam_utils.h>



#define BOOT_CTYPE_H

#include <linux/acpi.h>

arch/x86/boot/compressed/pgtable_64.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ int cmdline_find_option_bool(const char *option); 
static unsigned long find_trampoline_placement(void)

{

	unsigned long bios_start = 0, ebda_start = 0;

	unsigned long trampoline_start;

	struct boot_e820_entry *entry;

	char *signature;

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE