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

Merge tag 'x86-cleanups-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups, including a large series from Thomas Gleixner to cure
  sparse warnings"

* tag 'x86-cleanups-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Drop unused declaration of proc_nmi_enabled()
  x86/callthunks: Use EXPORT_PER_CPU_SYMBOL_GPL() for per CPU variables
  x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation
  x86/cpu: Use EXPORT_PER_CPU_SYMBOL_GPL() for x86_spec_ctrl_current
  x86/uaccess: Add missing __force to casts in __access_ok() and valid_user_address()
  x86/percpu: Cure per CPU madness on UP
  smp: Consolidate smp_prepare_boot_cpu()
  x86/msr: Add missing __percpu annotations
  x86/msr: Prepare for including <linux/percpu.h> into <asm/msr.h>
  perf/x86/amd/uncore: Fix __percpu annotation
  x86/nmi: Remove an unnecessary IS_ENABLED(CONFIG_SMP)
  x86/apm_32: Remove dead function apm_get_battery_status()
  x86/insn-eval: Fix function param name in get_eff_addr_sib()
parents d69ad12c 774a86f1

arch/alpha/kernel/smp.c

+0 −5
Original line number Diff line number Diff line
@@ -467,11 +467,6 @@ smp_prepare_cpus(unsigned int max_cpus) 
	smp_num_cpus = smp_num_probed;

}



void

smp_prepare_boot_cpu(void)

{

}



int

__cpu_up(unsigned int cpu, struct task_struct *tidle)

{

arch/arc/kernel/smp.c

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ struct plat_smp_ops __weak plat_smp_ops; 
/* XXX: per cpu ? Only needed once in early secondary boot */

struct task_struct *secondary_idle_tsk;



/* Called from start_kernel */

void __init smp_prepare_boot_cpu(void)

{

}



static int __init arc_get_cpu_map(const char *name, struct cpumask *cpumask)

{

	unsigned long dt_root = of_get_flat_dt_root();

arch/csky/kernel/smp.c

+0 −4
Original line number Diff line number Diff line
@@ -152,10 +152,6 @@ void arch_irq_work_raise(void) 
}

#endif



void __init smp_prepare_boot_cpu(void)

{

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

}

arch/hexagon/kernel/smp.c

+0 −4
Original line number Diff line number Diff line
@@ -114,10 +114,6 @@ void send_ipi(const struct cpumask *cpumask, enum ipi_message_type msg) 
	local_irq_restore(flags);

}



void __init smp_prepare_boot_cpu(void)

{

}



/*

 * interrupts should already be disabled from the VM

 * SP should already be correct; need to set THREADINFO_REG

arch/openrisc/kernel/smp.c

+0 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ static void boot_secondary(unsigned int cpu, struct task_struct *idle) 
	spin_unlock(&boot_lock);

}



void __init smp_prepare_boot_cpu(void)

{

}



void __init smp_init_cpus(void)

{

	struct device_node *cpu;