diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-01 19:34:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-01 19:34:39 +0300 |
| commit | 92598ae22f582547ebb060cf76f5869bc9780b80 (patch) | |
| tree | 9328ae9102ae3e6c3b537764b48d936db8184c12 /arch/x86/include | |
| parent | 94e37e84891900f56a01f49ac173bcb15e42e461 (diff) | |
| parent | 8f1d56f64f8d6b80dea2d1978d10071132a695c5 (diff) | |
| download | linux-92598ae22f582547ebb060cf76f5869bc9780b80.tar.xz | |
Merge tag 'x86_mm_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm updates from Borislav Petkov:
- Rename a PKRU macro to make more sense when reading the code
- Update pkeys documentation
- Avoid reading contended mm's TLB generation var if not absolutely
necessary along with fixing a case where arch_tlbbatch_flush()
doesn't adhere to the generation scheme and thus violates the
conditions for the above avoidance.
* tag 'x86_mm_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm/tlb: Ignore f->new_tlb_gen when zero
x86/pkeys: Clarify PKRU_AD_KEY macro
Documentation/protection-keys: Clean up documentation for User Space pkeys
x86/mm/tlb: Avoid reading mm_tlb_gen when possible
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/tlbflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 4af5579c7ef7..cda3118f3b27 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -16,6 +16,7 @@ void __flush_tlb_all(void); #define TLB_FLUSH_ALL -1UL +#define TLB_GENERATION_INVALID 0 void cr4_update_irqsoff(unsigned long set, unsigned long clear); unsigned long cr4_read_shadow(void); |