Commit a9251280 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1fd9f4ce f7081834
...@@ -532,7 +532,7 @@ config X86_EXTENDED_PLATFORM ...@@ -532,7 +532,7 @@ config X86_EXTENDED_PLATFORM
If you have one of these systems, or if you want to build a If you have one of these systems, or if you want to build a
generic distribution kernel, say Y here - otherwise say N. generic distribution kernel, say Y here - otherwise say N.
endif endif # X86_32
if X86_64 if X86_64
config X86_EXTENDED_PLATFORM config X86_EXTENDED_PLATFORM
...@@ -551,7 +551,7 @@ config X86_EXTENDED_PLATFORM ...@@ -551,7 +551,7 @@ config X86_EXTENDED_PLATFORM
If you have one of these systems, or if you want to build a If you have one of these systems, or if you want to build a
generic distribution kernel, say Y here - otherwise say N. generic distribution kernel, say Y here - otherwise say N.
endif endif # X86_64
# This is an alphabetically sorted list of 64 bit extended platforms # This is an alphabetically sorted list of 64 bit extended platforms
# Please maintain the alphabetic order if and when there are additions # Please maintain the alphabetic order if and when there are additions
config X86_NUMACHIP config X86_NUMACHIP
...@@ -900,7 +900,7 @@ config INTEL_TDX_GUEST ...@@ -900,7 +900,7 @@ config INTEL_TDX_GUEST
memory contents and CPU state. TDX guests are protected from memory contents and CPU state. TDX guests are protected from
some attacks from the VMM. some attacks from the VMM.
endif #HYPERVISOR_GUEST endif # HYPERVISOR_GUEST
source "arch/x86/Kconfig.cpu" source "arch/x86/Kconfig.cpu"
...@@ -2606,7 +2606,6 @@ source "drivers/idle/Kconfig" ...@@ -2606,7 +2606,6 @@ source "drivers/idle/Kconfig"
endmenu endmenu
menu "Bus options (PCI etc.)" menu "Bus options (PCI etc.)"
choice choice
...@@ -2830,7 +2829,6 @@ config AMD_NB ...@@ -2830,7 +2829,6 @@ config AMD_NB
endmenu endmenu
menu "Binary Emulations" menu "Binary Emulations"
config IA32_EMULATION config IA32_EMULATION
...@@ -2868,14 +2866,12 @@ config COMPAT ...@@ -2868,14 +2866,12 @@ config COMPAT
def_bool y def_bool y
depends on IA32_EMULATION || X86_X32_ABI depends on IA32_EMULATION || X86_X32_ABI
if COMPAT
config COMPAT_FOR_U64_ALIGNMENT config COMPAT_FOR_U64_ALIGNMENT
def_bool y def_bool y
endif depends on COMPAT
endmenu endmenu
config HAVE_ATOMIC_IOMAP config HAVE_ATOMIC_IOMAP
def_bool y def_bool y
depends on X86_32 depends on X86_32
......
...@@ -73,7 +73,6 @@ config DEBUG_TLBFLUSH ...@@ -73,7 +73,6 @@ config DEBUG_TLBFLUSH
bool "Set upper limit of TLB entries to flush one-by-one" bool "Set upper limit of TLB entries to flush one-by-one"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
help help
X86-only for now. X86-only for now.
This option allows the user to tune the amount of TLB entries the This option allows the user to tune the amount of TLB entries the
......
...@@ -6219,7 +6219,7 @@ static noinstr void vmx_l1d_flush(struct kvm_vcpu *vcpu) ...@@ -6219,7 +6219,7 @@ static noinstr void vmx_l1d_flush(struct kvm_vcpu *vcpu)
int size = PAGE_SIZE << L1D_CACHE_ORDER; int size = PAGE_SIZE << L1D_CACHE_ORDER;
/* /*
* This code is only executed when the the flush mode is 'cond' or * This code is only executed when the flush mode is 'cond' or
* 'always' * 'always'
*/ */
if (static_branch_likely(&vmx_l1d_flush_cond)) { if (static_branch_likely(&vmx_l1d_flush_cond)) {
......
...@@ -11937,7 +11937,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) ...@@ -11937,7 +11937,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
if (current->mm == kvm->mm) { if (current->mm == kvm->mm) {
/* /*
* Free memory regions allocated on behalf of userspace, * Free memory regions allocated on behalf of userspace,
* unless the the memory map has changed due to process exit * unless the memory map has changed due to process exit
* or fd copying. * or fd copying.
*/ */
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* The below thunking functions are only used after ExitBootServices() * The below thunking functions are only used after ExitBootServices()
* has been called. This simplifies things considerably as compared with * has been called. This simplifies things considerably as compared with
* the early EFI thunking because we can leave all the kernel state * the early EFI thunking because we can leave all the kernel state
* intact (GDT, IDT, etc) and simply invoke the the 32-bit EFI runtime * intact (GDT, IDT, etc) and simply invoke the 32-bit EFI runtime
* services from __KERNEL32_CS. This means we can continue to service * services from __KERNEL32_CS. This means we can continue to service
* interrupts across an EFI mixed mode call. * interrupts across an EFI mixed mode call.
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment