From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 12 Apr 2021 08:27:04 +0000 (+0200)
Subject: Merge branch 'x86/cleanups'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4fd8916c9a91f446d6027f5ca26c2248789020b2;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'x86/cleanups'
---

4fd8916c9a91f446d6027f5ca26c2248789020b2
diff --cc arch/x86/mm/tlb.c
index f4b162f273f5,98f269560d40..78804680e923
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@@ -907,10 -873,10 +907,10 @@@ static struct flush_tlb_info *get_flush
  	return info;
  }
  
 -static inline void put_flush_tlb_info(void)
 +static void put_flush_tlb_info(void)
  {
  #ifdef CONFIG_DEBUG_VM
- 	/* Complete reentrency prevention checks */
+ 	/* Complete reentrancy prevention checks */
  	barrier();
  	this_cpu_dec(flush_tlb_info_idx);
  #endif