Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ff4c51d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: Further re-factor HMP specific code"

parents 696d6979 591ce8ed

include/linux/sched.h

+0 −2
Original line number Diff line number Diff line
@@ -336,8 +336,6 @@ enum migrate_types { 
	GROUP_TO_GROUP,

};



extern const char *migrate_type_names[];



#include <linux/spinlock.h>



/*

include/trace/events/sched.h

+5 −3
Original line number Diff line number Diff line
@@ -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,

kernel/sched/core.c

+0 −7
Original line number Diff line number Diff line
@@ -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);

kernel/sched/hmp.c

+7 −0
Original line number Diff line number Diff line
@@ -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;