diff options
Diffstat (limited to 'drivers/base/cpu.c')
| -rw-r--r-- | drivers/base/cpu.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 182c6122f815..c1815b9dae68 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -487,7 +487,8 @@ static const struct attribute_group *cpu_root_attr_groups[] = {  bool cpu_is_hotpluggable(unsigned int cpu)  {  	struct device *dev = get_cpu_device(cpu); -	return dev && container_of(dev, struct cpu, dev)->hotpluggable; +	return dev && container_of(dev, struct cpu, dev)->hotpluggable +		&& tick_nohz_cpu_hotpluggable(cpu);  }  EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);  |