From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jun 2022 17:53:41 +0000 (-0700)
Subject: Merge tag 'x86-cleanups-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: baikal/mips/sdk6.1~5547
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=149aad9d88a23d132c9355e681d8837bad369d02;p=kernel.git

Merge tag 'x86-cleanups-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Thomas Gleixner:
 "A set of small x86 cleanups:

   - Remove unused headers in the IDT code

   - Kconfig indendation and comment fixes

   - Fix all 'the the' typos in one go instead of waiting for bots to
     fix one at a time"

* tag 'x86-cleanups-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix all occurences of the "the the" typo
  x86/idt: Remove unused headers
  x86/Kconfig: Fix indentation of arch/x86/Kconfig.debug
  x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig
---

149aad9d88a23d132c9355e681d8837bad369d02
diff --cc arch/x86/Kconfig
index e0498b2e9b79c,4d610ae216cee..7df2a9ef3662d
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2868,10 -2858,14 +2866,9 @@@ config COMPA
  	def_bool y
  	depends on IA32_EMULATION || X86_X32_ABI
  
--if COMPAT
  config COMPAT_FOR_U64_ALIGNMENT
  	def_bool y
- endif
 -
 -config SYSVIPC_COMPAT
 -	def_bool y
 -	depends on SYSVIPC
 -endif # COMPAT
++	depends on COMPAT
  
  endmenu