summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-03 10:34:59 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-03 10:34:59 -0700
commitae0165688cd4dee0b123ff196a198396ee993a60 (patch)
tree3330351a74d366826e1399802c0934c8d1475640
parenta6e4924acb6cec26aae85375e294f237afd9f5ae (diff)
parentc7e3dde08cc03d93db57942204397071fbbafd9c (diff)
Merge "sched: Add a stub function for init_clusters()"
-rw-r--r--kernel/sched/core.c2
-rw-r--r--kernel/sched/sched.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b146739f8d55..612cda15a8b0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7855,9 +7855,7 @@ void __init sched_init(void)
BUG_ON(num_possible_cpus() > BITS_PER_LONG);
-#ifdef CONFIG_SCHED_HMP
init_clusters();
-#endif
#ifdef CONFIG_FAIR_GROUP_SCHED
alloc_size += 2 * nr_cpu_ids * sizeof(void **);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 038d79dda2f2..1b641e60233e 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1426,6 +1426,7 @@ static inline void clear_hmp_request(int cpu) { }
static inline void mark_task_starting(struct task_struct *p) { }
static inline void set_window_start(struct rq *rq) { }
static inline void migrate_sync_cpu(int cpu, int new_cpu) {}
+static inline void init_clusters(void) {}
static inline void update_cluster_topology(void) { }
static inline void set_task_last_wake(struct task_struct *p, u64 wallclock) { }
static inline void set_task_last_switch_out(struct task_struct *p,