Commit 9fbb4810 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cleanups_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Borislav Petkov:

 - The usual set of cleanups and simplifications all over the tree

* tag 'x86_cleanups_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/segment: Use MOVL when reading segment registers
  selftests/x86: Clean up sysret_rip coding style
  x86/mm: Hide mm_free_global_asid() definition under CONFIG_BROADCAST_TLB_FLUSH
  x86/crash: Use set_memory_p() instead of __set_memory_prot()
  x86/CPU/AMD: Simplify the spectral chicken fix
  x86/platform/olpc: Replace strcpy() with strscpy() in xo15_sci_add()
  x86/split_lock: Remove dead string when split_lock_detect=fatal
parents dcb49710 53ed3d91

arch/x86/include/asm/mmu_context.h

+0 −2
Original line number Diff line number Diff line
@@ -139,9 +139,7 @@ static inline void mm_reset_untag_mask(struct mm_struct *mm) 
#define enter_lazy_tlb enter_lazy_tlb

extern void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk);



#define mm_init_global_asid mm_init_global_asid

extern void mm_init_global_asid(struct mm_struct *mm);



extern void mm_free_global_asid(struct mm_struct *mm);



/*

arch/x86/include/asm/msr-index.h

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ 


/* Zen 2 */

#define MSR_ZEN2_SPECTRAL_CHICKEN	0xc00110e3

#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT   BIT_ULL(1)

#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT	1



/* Fam 17h MSRs */

#define MSR_F17H_IRPERF			0xc00000e9

arch/x86/include/asm/segment.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static inline void __loadsegment_fs(unsigned short value) 
 * Save a segment register away:

 */

#define savesegment(seg, value)				\

	asm("mov %%" #seg ",%0":"=r" (value) : : "memory")

	asm("movl %%" #seg ",%k0" : "=r" (value) : : "memory")



#endif /* !__ASSEMBLER__ */

#endif /* __KERNEL__ */

arch/x86/include/asm/set_memory.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ int set_memory_rox(unsigned long addr, int numpages); 
 * The caller is required to take care of these.

 */



int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot);

int _set_memory_uc(unsigned long addr, int numpages);

int _set_memory_wc(unsigned long addr, int numpages);

int _set_memory_wt(unsigned long addr, int numpages);

arch/x86/include/asm/tlbflush.h

+3 −0
Original line number Diff line number Diff line
@@ -292,9 +292,12 @@ static inline bool mm_in_asid_transition(struct mm_struct *mm) 


	return mm && READ_ONCE(mm->context.asid_transition);

}



extern void mm_free_global_asid(struct mm_struct *mm);

#else

static inline u16 mm_global_asid(struct mm_struct *mm) { return 0; }

static inline void mm_init_global_asid(struct mm_struct *mm) { }

static inline void mm_free_global_asid(struct mm_struct *mm) { }

static inline void mm_assign_global_asid(struct mm_struct *mm, u16 asid) { }

static inline void mm_clear_asid_transition(struct mm_struct *mm) { }

static inline bool mm_in_asid_transition(struct mm_struct *mm) { return false; }