Commit 405f868f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cleanups_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Borislav Petkov:
 "Another branch with a nicely negative diffstat, just the way I
  like 'em:

   - Remove all uses of TIF_IA32 and TIF_X32 and reclaim the two bits in
     the end (Gabriel Krisman Bertazi)

   - All kinds of minor cleanups all over the tree"

* tag 'x86_cleanups_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  x86/ia32_signal: Propagate __user annotation properly
  x86/alternative: Update text_poke_bp() kernel-doc comment
  x86/PCI: Make a kernel-doc comment a normal one
  x86/asm: Drop unused RDPID macro
  x86/boot/compressed/64: Use TEST %reg,%reg instead of CMP $0,%reg
  x86/head64: Remove duplicate include
  x86/mm: Declare 'start' variable where it is used
  x86/head/64: Remove unused GET_CR2_INTO() macro
  x86/boot: Remove unused finalize_identity_maps()
  x86/uaccess: Document copy_from_user_nmi()
  x86/dumpstack: Make show_trace_log_lvl() static
  x86/mtrr: Fix a kernel-doc markup
  x86/setup: Remove unused MCA variables
  x86, libnvdimm/test: Remove COPY_MC_TEST
  x86: Reclaim TIF_IA32 and TIF_X32
  x86/mm: Convert mmu context ia32_compat into a proper flags field
  x86/elf: Use e_machine to check for x32/ia32 in setup_additional_pages()
  elf: Expose ELF header on arch_setup_additional_pages()
  x86/elf: Use e_machine to select start_thread for x32
  elf: Expose ELF header in compat_start_thread()
  ...
parents 54d79483 9a02fd8b

arch/x86/Kconfig.debug

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ config EARLY_PRINTK_USB_XDBC 
	  You should normally say N here, unless you want to debug early

	  crashes or need a very simple printk logging facility.



config COPY_MC_TEST

	def_bool n



config EFI_PGT_DUMP

	bool "Dump the EFI pagetable"

	depends on EFI

arch/x86/boot/compressed/head_64.S

+4 −4
Original line number Diff line number Diff line
@@ -241,12 +241,12 @@ SYM_FUNC_START(startup_32) 
	leal	rva(startup_64)(%ebp), %eax

#ifdef CONFIG_EFI_MIXED

	movl	rva(efi32_boot_args)(%ebp), %edi

	cmp	$0, %edi

	testl	%edi, %edi

	jz	1f

	leal	rva(efi64_stub_entry)(%ebp), %eax

	movl	rva(efi32_boot_args+4)(%ebp), %esi

	movl	rva(efi32_boot_args+8)(%ebp), %edx	// saved bootparams pointer

	cmpl	$0, %edx

	testl	%edx, %edx

	jnz	1f

	/*

	 * efi_pe_entry uses MS calling convention, which requires 32 bytes of
@@ -592,7 +592,7 @@ SYM_CODE_START(trampoline_32bit_src) 
	movl	%eax, %cr0



	/* Check what paging mode we want to be in after the trampoline */

	cmpl	$0, %edx

	testl	%edx, %edx

	jz	1f



	/* We want 5-level paging: don't touch CR3 if it already points to 5-level page tables */
@@ -622,7 +622,7 @@ SYM_CODE_START(trampoline_32bit_src) 


	/* Enable PAE and LA57 (if required) paging modes */

	movl	$X86_CR4_PAE, %eax

	cmpl	$0, %edx

	testl	%edx, %edx

	jz	1f

	orl	$X86_CR4_LA57, %eax

1:

arch/x86/boot/compressed/ident_map_64.c

+0 −10
Original line number Diff line number Diff line
@@ -168,16 +168,6 @@ void initialize_identity_maps(void *rmode) 
	write_cr3(top_level_pgt);

}



/*

 * This switches the page tables to the new level4 that has been built

 * via calls to add_identity_map() above. If booted via startup_32(),

 * this is effectively a no-op.

 */

void finalize_identity_maps(void)

{

	write_cr3(top_level_pgt);

}



static pte_t *split_large_pmd(struct x86_mapping_info *info,

			      pmd_t *pmdp, unsigned long __address)

{

arch/x86/entry/vdso/vma.c

+2 −2
Original line number Diff line number Diff line
@@ -413,10 +413,10 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 


#ifdef CONFIG_COMPAT

int compat_arch_setup_additional_pages(struct linux_binprm *bprm,

				       int uses_interp)

				       int uses_interp, bool x32)

{

#ifdef CONFIG_X86_X32_ABI

	if (test_thread_flag(TIF_X32)) {

	if (x32) {

		if (!vdso64_enabled)

			return 0;

		return map_vdso_randomized(&vdso_image_x32);

arch/x86/entry/vsyscall/vsyscall_64.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static struct vm_area_struct gate_vma __ro_after_init = { 
struct vm_area_struct *get_gate_vma(struct mm_struct *mm)

{

#ifdef CONFIG_COMPAT

	if (!mm || mm->context.ia32_compat)

	if (!mm || !(mm->context.flags & MM_CONTEXT_HAS_VSYSCALL))

		return NULL;

#endif

	if (vsyscall_mode == NONE)