Commit 18398bb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 cleanups from Borislav Petkov:
 "The usual round of random minor fixes and cleanups all over the place"

* tag 'x86_cleanups_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Makefile: Remove unneeded whitespaces before tabs
  x86/of: Kill unused early_init_dt_scan_chosen_arch()
  x86: Fix misspelled Kconfig symbols
  x86/Kconfig: Remove references to obsolete Kconfig symbols
  x86/smp: Remove unnecessary assignment to local var freq_scale
parents 6e5772c8 a757ac55

arch/x86/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -611,9 +611,7 @@ config X86_INTEL_MID 
	depends on X86_IO_APIC

	select I2C

	select DW_APB_TIMER

	select APB_TIMER

	select INTEL_SCU_PCI

	select MFD_INTEL_MSIC

	help

	  Select to build a kernel capable of supporting Intel MID (Mobile

	  Internet Device) platform systems which do not have the PCI legacy

arch/x86/include/asm/ia32.h

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,6 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); 


#endif



#endif /* !CONFIG_IA32_SUPPORT */

#endif /* CONFIG_IA32_EMULATION */



#endif /* _ASM_X86_IA32_H */

arch/x86/include/asm/irq_stack.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
 *     the output constraints to make the compiler aware that R11 cannot be

 *     reused after the asm() statement.

 *

 *     For builds with CONFIG_UNWIND_FRAME_POINTER ASM_CALL_CONSTRAINT is

 *     For builds with CONFIG_UNWINDER_FRAME_POINTER, ASM_CALL_CONSTRAINT is

 *     required as well as this prevents certain creative GCC variants from

 *     misplacing the ASM code.

 *

arch/x86/include/asm/page_32.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static inline void copy_page(void *to, void *from) 
{

	memcpy(to, from, PAGE_SIZE);

}

#endif	/* CONFIG_X86_3DNOW */

#endif	/* CONFIG_X86_USE_3DNOW */

#endif	/* !__ASSEMBLY__ */



#endif /* _ASM_X86_PAGE_32_H */

arch/x86/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ do { \ 
		     : [umem] "m" (__m(addr)),				\

		       [efault] "i" (-EFAULT), "0" (err))



#endif // CONFIG_CC_ASM_GOTO_OUTPUT

#endif // CONFIG_CC_HAS_ASM_GOTO_OUTPUT



/* FIXME: this hack is definitely wrong -AK */

struct __large_struct { unsigned long buf[100]; };