Commit 97efd283 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-cleanups-2023-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 cleanups from Ingo Molnar:
 "The following commit deserves special mention:

   22dc02f8 Revert "sched/fair: Move unused stub functions to header"

  This is in x86/cleanups, because the revert is a re-application of a
  number of cleanups that got removed inadvertedly"

[ This also effectively undoes the amd_check_microcode() microcode
  declaration change I had done in my microcode loader merge in commit
  42a7f6e3 ("Merge tag 'x86_microcode_for_v6.6_rc1' [...]").

  I picked the declaration change by Arnd from this branch instead,
  which put it in <asm/processor.h> instead of <asm/microcode.h> like I
  had done in my merge resolution   - Linus ]

* tag 'x86-cleanups-2023-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/uv: Refactor code using deprecated strncpy() interface to use strscpy()
  x86/hpet: Refactor code using deprecated strncpy() interface to use strscpy()
  x86/platform/uv: Refactor code using deprecated strcpy()/strncpy() interfaces to use strscpy()
  x86/qspinlock-paravirt: Fix missing-prototype warning
  x86/paravirt: Silence unused native_pv_lock_init() function warning
  x86/alternative: Add a __alt_reloc_selftest() prototype
  x86/purgatory: Include header for warn() declaration
  x86/asm: Avoid unneeded __div64_32 function definition
  Revert "sched/fair: Move unused stub functions to header"
  x86/apic: Hide unused safe_smp_processor_id() on 32-bit UP
  x86/cpu: Fix amd_check_microcode() declaration
parents 3ca9a836 212f07a2

arch/x86/boot/compressed/error.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "misc.h"

#include "error.h"



void warn(char *m)

void warn(const char *m)

{

	error_putstr("\n\n");

	error_putstr(m);

arch/x86/boot/compressed/error.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <linux/compiler.h>



void warn(char *m);

void warn(const char *m);

void error(char *m) __noreturn;

void panic(const char *fmt, ...) __noreturn __cold;

arch/x86/include/asm/div64.h

+6 −0
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ static inline u64 mul_u32_u32(u32 a, u32 b) 
}

#define mul_u32_u32 mul_u32_u32



/*

 * __div64_32() is never called on x86, so prevent the

 * generic definition from getting built.

 */

#define __div64_32



#else

# include <asm-generic/div64.h>

arch/x86/include/asm/microcode.h

+0 −6
Original line number Diff line number Diff line
@@ -75,10 +75,4 @@ void show_ucode_info_early(void); 
static inline void show_ucode_info_early(void) { }

#endif /* !CONFIG_CPU_SUP_INTEL */



#ifdef CONFIG_CPU_SUP_AMD

void amd_check_microcode(void);

#else /* CONFIG_CPU_SUP_AMD */

static inline void amd_check_microcode(void) {}

#endif



#endif /* _ASM_X86_MICROCODE_H */

arch/x86/include/asm/paravirt.h

+7 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ static __always_inline unsigned long arch_local_irq_save(void) 
	     ".popsection")



extern void default_banner(void);

void native_pv_lock_init(void) __init;



#else  /* __ASSEMBLY__ */
@@ -778,6 +779,12 @@ extern void default_banner(void); 
#endif /* __ASSEMBLY__ */

#else  /* CONFIG_PARAVIRT */

# define default_banner x86_init_noop



#ifndef __ASSEMBLY__

static inline void native_pv_lock_init(void)

{

}

#endif

#endif /* !CONFIG_PARAVIRT */



#ifndef __ASSEMBLY__