sched: Compile cpu_isolated_mask in SCHED_WALT only

cpu_isolated_mask can only be used when SCHED_WALT is enabled. The
addition of the cpu_isolated_mask causes ABI to break. Thus, compile
references to cpu_isolated_mask only when SCHED_WALT is enabled.

Change-Id: I0982f6431abca807168dbabc4aca74771819565c
Signed-off-by: Elliot Berman <[email protected]>
This commit is contained in:
Elliot Berman 2020-05-27 15:45:11 -07:00
commit 9f125adcf2
15 changed files with 17282 additions and 17192 deletions

View file

@ -1173,10 +1173,12 @@ int lock_device_hotplug_sysfs(void)
return restart_syscall();
}
#ifdef CONFIG_SCHED_WALT
void lock_device_hotplug_assert(void)
{
lockdep_assert_held(&device_hotplug_lock);
}
#endif
#ifdef CONFIG_BLOCK
static inline int device_is_not_partition(struct device *dev)

View file

@ -183,6 +183,7 @@ static struct attribute_group crash_note_cpu_attr_group = {
};
#endif
#ifdef CONFIG_SCHED_WALT
#ifdef CONFIG_HOTPLUG_CPU
static ssize_t isolate_show(struct device *dev,
struct device_attribute *attr, char *buf)
@ -209,7 +210,6 @@ static struct attribute_group cpu_isolated_attr_group = {
};
#endif
#ifdef CONFIG_SCHED_WALT
static ssize_t sched_load_boost_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@ -266,10 +266,10 @@ static const struct attribute_group *common_cpu_attr_groups[] = {
#ifdef CONFIG_KEXEC
&crash_note_cpu_attr_group,
#endif
#ifdef CONFIG_SCHED_WALT
#ifdef CONFIG_HOTPLUG_CPU
&cpu_isolated_attr_group,
#endif
#ifdef CONFIG_SCHED_WALT
&sched_cpu_attr_group,
#endif
NULL
@ -279,10 +279,10 @@ static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
#ifdef CONFIG_KEXEC
&crash_note_cpu_attr_group,
#endif
#ifdef CONFIG_SCHED_WALT
#ifdef CONFIG_HOTPLUG_CPU
&cpu_isolated_attr_group,
#endif
#ifdef CONFIG_SCHED_WALT
&sched_cpu_attr_group,
#endif
NULL
@ -314,7 +314,9 @@ static struct cpu_attr cpu_attrs[] = {
_CPU_ATTR(online, &__cpu_online_mask),
_CPU_ATTR(possible, &__cpu_possible_mask),
_CPU_ATTR(present, &__cpu_present_mask),
#ifdef CONFIG_SCHED_WALT
_CPU_ATTR(core_ctl_isolated, &__cpu_isolated_mask),
#endif
};
/*
@ -564,7 +566,9 @@ static struct attribute *cpu_root_attrs[] = {
&cpu_attrs[0].attr.attr,
&cpu_attrs[1].attr.attr,
&cpu_attrs[2].attr.attr,
#ifdef CONFIG_SCHED_WALT
&cpu_attrs[3].attr.attr,
#endif
&dev_attr_kernel_max.attr,
&dev_attr_offline.attr,
&dev_attr_isolated.attr,