diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cpuset.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 3ff910eb30d3..2b93b50cbe4b 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -517,6 +517,7 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial) | |||
517 | return 0; | 517 | return 0; |
518 | } | 518 | } |
519 | 519 | ||
520 | #ifdef CONFIG_SMP | ||
520 | /* | 521 | /* |
521 | * Helper routine for generate_sched_domains(). | 522 | * Helper routine for generate_sched_domains(). |
522 | * Do cpusets a, b have overlapping cpus_allowed masks? | 523 | * Do cpusets a, b have overlapping cpus_allowed masks? |
@@ -811,6 +812,18 @@ static void do_rebuild_sched_domains(struct work_struct *unused) | |||
811 | 812 | ||
812 | put_online_cpus(); | 813 | put_online_cpus(); |
813 | } | 814 | } |
815 | #else /* !CONFIG_SMP */ | ||
816 | static void do_rebuild_sched_domains(struct work_struct *unused) | ||
817 | { | ||
818 | } | ||
819 | |||
820 | static int generate_sched_domains(struct cpumask **domains, | ||
821 | struct sched_domain_attr **attributes) | ||
822 | { | ||
823 | *domains = NULL; | ||
824 | return 1; | ||
825 | } | ||
826 | #endif /* CONFIG_SMP */ | ||
814 | 827 | ||
815 | static DECLARE_WORK(rebuild_sched_domains_work, do_rebuild_sched_domains); | 828 | static DECLARE_WORK(rebuild_sched_domains_work, do_rebuild_sched_domains); |
816 | 829 | ||
@@ -1164,8 +1177,10 @@ int current_cpuset_is_being_rebound(void) | |||
1164 | 1177 | ||
1165 | static int update_relax_domain_level(struct cpuset *cs, s64 val) | 1178 | static int update_relax_domain_level(struct cpuset *cs, s64 val) |
1166 | { | 1179 | { |
1180 | #ifdef CONFIG_SMP | ||
1167 | if (val < -1 || val >= SD_LV_MAX) | 1181 | if (val < -1 || val >= SD_LV_MAX) |
1168 | return -EINVAL; | 1182 | return -EINVAL; |
1183 | #endif | ||
1169 | 1184 | ||
1170 | if (val != cs->relax_domain_level) { | 1185 | if (val != cs->relax_domain_level) { |
1171 | cs->relax_domain_level = val; | 1186 | cs->relax_domain_level = val; |