summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/sched.h2
-rw-r--r--include/trace/events/sched.h8
-rw-r--r--kernel/sched/core.c7
-rw-r--r--kernel/sched/hmp.c7
4 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 74b2a11b1d1c..4701e0403167 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -336,8 +336,6 @@ enum migrate_types {
GROUP_TO_GROUP,
};
-extern const char *migrate_type_names[];
-
#include <linux/spinlock.h>
/*
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index f35630045c2f..1ef5ec3eaf70 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -9,9 +9,6 @@
#include <linux/binfmts.h>
struct rq;
-struct group_cpu_time;
-struct migration_sum_data;
-extern const char *task_event_names[];
/*
* Tracepoint for calling kthread_stop, performed to end a kthread:
@@ -113,6 +110,11 @@ TRACE_EVENT(sched_enq_deq_task,
#ifdef CONFIG_SCHED_HMP
+struct group_cpu_time;
+struct migration_sum_data;
+extern const char *task_event_names[];
+extern const char *migrate_type_names[];
+
TRACE_EVENT(sched_task_load,
TP_PROTO(struct task_struct *p, bool boost, int reason,
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;