Commit 195fb517 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov (AMD)
Browse files

cpu: Move CPU hotplug function declarations into their own header 



Avoid upcoming #include hell when <linux/cachinfo.h> wants to use
lockdep_assert_cpus_held() and creates a #include loop that would
break the build for arch/riscv.

  [ bp: s/cpu/CPU/g ]

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240610003927.341707-2-tony.luck@intel.com
parent 83a7eefe

include/linux/cpu.h

+1 −32
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/compiler.h>

#include <linux/cpumask.h>

#include <linux/cpuhotplug.h>

#include <linux/cpuhplock.h>

#include <linux/cpu_smt.h>



struct device;
@@ -132,38 +133,6 @@ static inline int add_cpu(unsigned int cpu) { return 0;} 
#endif /* CONFIG_SMP */

extern const struct bus_type cpu_subsys;



extern int lockdep_is_cpus_held(void);



#ifdef CONFIG_HOTPLUG_CPU

extern void cpus_write_lock(void);

extern void cpus_write_unlock(void);

extern void cpus_read_lock(void);

extern void cpus_read_unlock(void);

extern int  cpus_read_trylock(void);

extern void lockdep_assert_cpus_held(void);

extern void cpu_hotplug_disable(void);

extern void cpu_hotplug_enable(void);

void clear_tasks_mm_cpumask(int cpu);

int remove_cpu(unsigned int cpu);

int cpu_device_down(struct device *dev);

extern void smp_shutdown_nonboot_cpus(unsigned int primary_cpu);



#else /* CONFIG_HOTPLUG_CPU */



static inline void cpus_write_lock(void) { }

static inline void cpus_write_unlock(void) { }

static inline void cpus_read_lock(void) { }

static inline void cpus_read_unlock(void) { }

static inline int  cpus_read_trylock(void) { return true; }

static inline void lockdep_assert_cpus_held(void) { }

static inline void cpu_hotplug_disable(void) { }

static inline void cpu_hotplug_enable(void) { }

static inline int remove_cpu(unsigned int cpu) { return -EPERM; }

static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { }

#endif	/* !CONFIG_HOTPLUG_CPU */



DEFINE_LOCK_GUARD_0(cpus_read_lock, cpus_read_lock(), cpus_read_unlock())



#ifdef CONFIG_PM_SLEEP_SMP

extern int freeze_secondary_cpus(int primary);

extern void thaw_secondary_cpus(void);

include/linux/cpuhplock.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * include/linux/cpuhplock.h - CPU hotplug locking

 *

 * Locking functions for CPU hotplug.

 */

#ifndef _LINUX_CPUHPLOCK_H_

#define _LINUX_CPUHPLOCK_H_



#include <linux/cleanup.h>

#include <linux/errno.h>



struct device;



extern int lockdep_is_cpus_held(void);



#ifdef CONFIG_HOTPLUG_CPU

extern void cpus_write_lock(void);

extern void cpus_write_unlock(void);

extern void cpus_read_lock(void);

extern void cpus_read_unlock(void);

extern int  cpus_read_trylock(void);

extern void lockdep_assert_cpus_held(void);

extern void cpu_hotplug_disable(void);

extern void cpu_hotplug_enable(void);

void clear_tasks_mm_cpumask(int cpu);

int remove_cpu(unsigned int cpu);

int cpu_device_down(struct device *dev);

extern void smp_shutdown_nonboot_cpus(unsigned int primary_cpu);



#else /* CONFIG_HOTPLUG_CPU */



static inline void cpus_write_lock(void) { }

static inline void cpus_write_unlock(void) { }

static inline void cpus_read_lock(void) { }

static inline void cpus_read_unlock(void) { }

static inline int  cpus_read_trylock(void) { return true; }

static inline void lockdep_assert_cpus_held(void) { }

static inline void cpu_hotplug_disable(void) { }

static inline void cpu_hotplug_enable(void) { }

static inline int remove_cpu(unsigned int cpu) { return -EPERM; }

static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { }

#endif	/* !CONFIG_HOTPLUG_CPU */



DEFINE_LOCK_GUARD_0(cpus_read_lock, cpus_read_lock(), cpus_read_unlock())



#endif /* _LINUX_CPUHPLOCK_H_ */