Commit 51f24030 authored by Shuo Liu's avatar Shuo Liu Committed by Greg Kroah-Hartman
Browse files

cpu/hotplug: Fix build error of using {add,remove}_cpu() with !CONFIG_SMP 



279dcf69 ("virt: acrn: Introduce an interface for Service VM to
control vCPU") introduced {add,remove}_cpu() usage and it hit below
error with !CONFIG_SMP:

../drivers/virt/acrn/hsm.c: In function ‘remove_cpu_store’:
../drivers/virt/acrn/hsm.c:389:3: error: implicit declaration of function ‘remove_cpu’; [-Werror=implicit-function-declaration]
   remove_cpu(cpu);

../drivers/virt/acrn/hsm.c:402:2: error: implicit declaration of function ‘add_cpu’; [-Werror=implicit-function-declaration]
   add_cpu(cpu);

Add add_cpu() function prototypes with !CONFIG_SMP and remove_cpu() with
!CONFIG_HOTPLUG_CPU for such usage.

Fixes: 279dcf69 ("virt: acrn: Introduce an interface for Service VM to control vCPU")
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Qais Yousef <qais.yousef@arm.com>
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reviewed-by: default avatarQais Yousef <qais.yousef@arm.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: default avatarShuo Liu <shuo.a.liu@intel.com>
Link: https://lore.kernel.org/r/20210221134339.57851-1-shuo.a.liu@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15097e93

include/linux/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static inline void cpu_maps_update_done(void) 
{

}



static inline int add_cpu(unsigned int cpu) { return 0;}



#endif /* CONFIG_SMP */

extern struct bus_type cpu_subsys;
@@ -137,6 +139,7 @@ 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 */