Skip to content

Commit fcc1965

Browse files
committed
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()
2 parents d69ad12 + 774a86f commit fcc1965

File tree

37 files changed

+103
-145
lines changed

37 files changed

+103
-145
lines changed

arch/alpha/kernel/smp.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,6 @@ smp_prepare_cpus(unsigned int max_cpus)
467467
smp_num_cpus = smp_num_probed;
468468
}
469469

470-
void
471-
smp_prepare_boot_cpu(void)
472-
{
473-
}
474-
475470
int
476471
__cpu_up(unsigned int cpu, struct task_struct *tidle)
477472
{

arch/arc/kernel/smp.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ struct plat_smp_ops __weak plat_smp_ops;
3939
/* XXX: per cpu ? Only needed once in early secondary boot */
4040
struct task_struct *secondary_idle_tsk;
4141

42-
/* Called from start_kernel */
43-
void __init smp_prepare_boot_cpu(void)
44-
{
45-
}
46-
4742
static int __init arc_get_cpu_map(const char *name, struct cpumask *cpumask)
4843
{
4944
unsigned long dt_root = of_get_flat_dt_root();

arch/csky/kernel/smp.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ void arch_irq_work_raise(void)
152152
}
153153
#endif
154154

155-
void __init smp_prepare_boot_cpu(void)
156-
{
157-
}
158-
159155
void __init smp_prepare_cpus(unsigned int max_cpus)
160156
{
161157
}

arch/hexagon/kernel/smp.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ void send_ipi(const struct cpumask *cpumask, enum ipi_message_type msg)
114114
local_irq_restore(flags);
115115
}
116116

117-
void __init smp_prepare_boot_cpu(void)
118-
{
119-
}
120-
121117
/*
122118
* interrupts should already be disabled from the VM
123119
* SP should already be correct; need to set THREADINFO_REG

arch/openrisc/kernel/smp.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ static void boot_secondary(unsigned int cpu, struct task_struct *idle)
5757
spin_unlock(&boot_lock);
5858
}
5959

60-
void __init smp_prepare_boot_cpu(void)
61-
{
62-
}
63-
6460
void __init smp_init_cpus(void)
6561
{
6662
struct device_node *cpu;

arch/riscv/kernel/smpboot.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242

4343
static DECLARE_COMPLETION(cpu_running);
4444

45-
void __init smp_prepare_boot_cpu(void)
46-
{
47-
}
48-
4945
void __init smp_prepare_cpus(unsigned int max_cpus)
5046
{
5147
int cpuid;

arch/sparc/kernel/smp_64.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
12061206
{
12071207
}
12081208

1209-
void smp_prepare_boot_cpu(void)
1210-
{
1211-
}
1212-
12131209
void __init smp_setup_processor_id(void)
12141210
{
12151211
if (tlb_type == spitfire)

arch/x86/events/amd/uncore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ union amd_uncore_info {
7171
};
7272

7373
struct amd_uncore {
74-
union amd_uncore_info * __percpu info;
74+
union amd_uncore_info __percpu *info;
7575
struct amd_uncore_pmu *pmus;
7676
unsigned int num_pmus;
7777
bool init_done;

arch/x86/events/intel/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/kvm_host.h>
1818

1919
#include <asm/cpufeature.h>
20+
#include <asm/debugreg.h>
2021
#include <asm/hardirq.h>
2122
#include <asm/intel-family.h>
2223
#include <asm/intel_pt.h>

arch/x86/events/intel/ds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/sched/clock.h>
66

77
#include <asm/cpu_entry_area.h>
8+
#include <asm/debugreg.h>
89
#include <asm/perf_event.h>
910
#include <asm/tlbflush.h>
1011
#include <asm/insn.h>

0 commit comments

Comments
 (0)