summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-09 01:26:13 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-09 01:26:13 -0700
commit9ff4c51df999403ff59c5586f946518e90cdaff9 (patch)
tree048b154b47a0f947a1c53307bd883029576fb341 /kernel
parent696d6979fd72ffd006929fd053213d10f301ccb2 (diff)
parent591ce8ed84e31fc674d73947eb6a1abc5b71afcf (diff)
Merge "sched: Further re-factor HMP specific code"
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c7
-rw-r--r--kernel/sched/hmp.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ae54c5bfac1d..7474463b9835 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -90,13 +90,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/sched.h>
-const char *task_event_names[] = {"PUT_PREV_TASK", "PICK_NEXT_TASK",
- "TASK_WAKE", "TASK_MIGRATE", "TASK_UPDATE",
- "IRQ_UPDATE"};
-
-const char *migrate_type_names[] = {"GROUP_TO_RQ", "RQ_TO_GROUP",
- "RQ_TO_RQ", "GROUP_TO_GROUP"};
-
ATOMIC_NOTIFIER_HEAD(load_alert_notifier_head);
DEFINE_MUTEX(sched_domains_mutex);
diff --git a/kernel/sched/hmp.c b/kernel/sched/hmp.c
index 447f3880f645..837025353db0 100644
--- a/kernel/sched/hmp.c
+++ b/kernel/sched/hmp.c
@@ -22,6 +22,13 @@
#include <trace/events/sched.h>
+const char *task_event_names[] = {"PUT_PREV_TASK", "PICK_NEXT_TASK",
+ "TASK_WAKE", "TASK_MIGRATE", "TASK_UPDATE",
+ "IRQ_UPDATE"};
+
+const char *migrate_type_names[] = {"GROUP_TO_RQ", "RQ_TO_GROUP",
+ "RQ_TO_RQ", "GROUP_TO_GROUP"};
+
static ktime_t ktime_last;
static bool sched_ktime_suspended;