Commit d7489818 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cleanups_for_v6.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Borislav Petkov:

 - The mandatory pile of cleanups the cat drags in every merge window

* tag 'x86_cleanups_for_v6.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Clean up whitespace in a20.c
  x86/mm: Delete disabled debug code
  x86/{boot,mtrr}: Remove unused function declarations
  x86/percpu: Use BIT_WORD() and BIT_MASK() macros
  x86/cpufeatures: Correct LKGS feature flag description
  x86/idtentry: Add missing '*' to kernel-doc lines
parents 2ae20d65 d911fe6e

arch/x86/boot/boot.h

+0 −2
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ static inline bool heap_free(size_t n) 


void copy_to_fs(addr_t dst, void *src, size_t len);

void *copy_from_fs(void *dst, addr_t src, size_t len);

void copy_to_gs(addr_t dst, void *src, size_t len);

void *copy_from_gs(void *dst, addr_t src, size_t len);



/* a20.c */

int enable_a20(void);

arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ 
#define X86_FEATURE_FSRS		(12*32+11) /* Fast short REP STOSB */

#define X86_FEATURE_FSRC		(12*32+12) /* Fast short REP {CMPSB,SCASB} */

#define X86_FEATURE_FRED		(12*32+17) /* "fred" Flexible Return and Event Delivery */

#define X86_FEATURE_LKGS		(12*32+18) /* Load "kernel" (userspace) GS */

#define X86_FEATURE_LKGS		(12*32+18) /* Like MOV_GS except MSR_KERNEL_GS_BASE = GS.base */

#define X86_FEATURE_WRMSRNS		(12*32+19) /* Non-serializing WRMSR */

#define X86_FEATURE_AMX_FP16		(12*32+21) /* AMX fp16 Support */

#define X86_FEATURE_AVX_IFMA            (12*32+23) /* Support for VPMADD52[H,L]UQ */

arch/x86/include/asm/idtentry.h

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static __always_inline void __##func(struct pt_regs *regs) 


/**

 * DEFINE_IDTENTRY_VC_KERNEL - Emit code for VMM communication handler

			       when raised from kernel mode

 *			       when raised from kernel mode

 * @func:	Function name of the entry point

 *

 * Maps to DEFINE_IDTENTRY_RAW_ERRORCODE
@@ -403,7 +403,7 @@ static __always_inline void __##func(struct pt_regs *regs) 


/**

 * DEFINE_IDTENTRY_VC_USER - Emit code for VMM communication handler

			     when raised from user mode

 *			     when raised from user mode

 * @func:	Function name of the entry point

 *

 * Maps to DEFINE_IDTENTRY_RAW_ERRORCODE

arch/x86/include/asm/percpu.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#else /* !__ASSEMBLY__: */



#include <linux/args.h>

#include <linux/bits.h>

#include <linux/build_bug.h>

#include <linux/stringify.h>

#include <asm/asm.h>
@@ -572,9 +573,9 @@ do { \ 
#define x86_this_cpu_constant_test_bit(_nr, _var)			\

({									\

	unsigned long __percpu *addr__ =				\

		(unsigned long __percpu *)&(_var) + ((_nr) / BITS_PER_LONG); \

		(unsigned long __percpu *)&(_var) + BIT_WORD(_nr);	\

									\

	!!((1UL << ((_nr) % BITS_PER_LONG)) & raw_cpu_read(*addr__));	\

	!!(BIT_MASK(_nr) & raw_cpu_read(*addr__));			\

})



#define x86_this_cpu_variable_test_bit(_nr, _var)			\

arch/x86/kernel/cpu/mtrr/mtrr.h

+0 −4
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ struct set_mtrr_context { 
	u32		ccr3;

};



void set_mtrr_done(struct set_mtrr_context *ctxt);

void set_mtrr_cache_disable(struct set_mtrr_context *ctxt);

void set_mtrr_prepare_save(struct set_mtrr_context *ctxt);



void fill_mtrr_var_range(unsigned int index,

		u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);

bool get_mtrr_state(void);