diff options
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | kernel/sched.c | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 38a3f4b15394..91207df702e8 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -912,7 +912,6 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd) | |||
912 | 912 | ||
913 | extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new, | 913 | extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new, |
914 | struct sched_domain_attr *dattr_new); | 914 | struct sched_domain_attr *dattr_new); |
915 | extern int arch_reinit_sched_domains(void); | ||
916 | 915 | ||
917 | /* Test a flag in parent sched domain */ | 916 | /* Test a flag in parent sched domain */ |
918 | static inline int test_sd_parent(struct sched_domain *sd, int flag) | 917 | static inline int test_sd_parent(struct sched_domain *sd, int flag) |
diff --git a/kernel/sched.c b/kernel/sched.c index 9a8e296959c1..c5019a5dcaa4 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -7987,7 +7987,7 @@ match2: | |||
7987 | } | 7987 | } |
7988 | 7988 | ||
7989 | #if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT) | 7989 | #if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT) |
7990 | int arch_reinit_sched_domains(void) | 7990 | static void arch_reinit_sched_domains(void) |
7991 | { | 7991 | { |
7992 | get_online_cpus(); | 7992 | get_online_cpus(); |
7993 | 7993 | ||
@@ -7996,13 +7996,10 @@ int arch_reinit_sched_domains(void) | |||
7996 | 7996 | ||
7997 | rebuild_sched_domains(); | 7997 | rebuild_sched_domains(); |
7998 | put_online_cpus(); | 7998 | put_online_cpus(); |
7999 | |||
8000 | return 0; | ||
8001 | } | 7999 | } |
8002 | 8000 | ||
8003 | static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) | 8001 | static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) |
8004 | { | 8002 | { |
8005 | int ret; | ||
8006 | unsigned int level = 0; | 8003 | unsigned int level = 0; |
8007 | 8004 | ||
8008 | if (sscanf(buf, "%u", &level) != 1) | 8005 | if (sscanf(buf, "%u", &level) != 1) |
@@ -8023,9 +8020,9 @@ static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) | |||
8023 | else | 8020 | else |
8024 | sched_mc_power_savings = level; | 8021 | sched_mc_power_savings = level; |
8025 | 8022 | ||
8026 | ret = arch_reinit_sched_domains(); | 8023 | arch_reinit_sched_domains(); |
8027 | 8024 | ||
8028 | return ret ? ret : count; | 8025 | return count; |
8029 | } | 8026 | } |
8030 | 8027 | ||
8031 | #ifdef CONFIG_SCHED_MC | 8028 | #ifdef CONFIG_SCHED_MC |