From 76ac2a28035f2c5648fd5fb4babcd94ca1c73b2b Mon Sep 17 00:00:00 2001 From: Olav Haugan Date: Tue, 18 Oct 2016 18:09:59 -0700 Subject: sched/core_ctl: Move header file to global location Move the header file of core control to the standard linux include directory to allow other entities to include this file. Change-Id: I2ddb8b3b96063be3c6a6cb6bc333998e007f9de7 Signed-off-by: Olav Haugan --- include/linux/sched/core_ctl.h | 27 +++++++++++++++++++++++++++ kernel/sched/core.c | 2 +- kernel/sched/core_ctl.h | 27 --------------------------- kernel/sched/hmp.c | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 include/linux/sched/core_ctl.h delete mode 100644 kernel/sched/core_ctl.h diff --git a/include/linux/sched/core_ctl.h b/include/linux/sched/core_ctl.h new file mode 100644 index 000000000000..98d7cb3e899b --- /dev/null +++ b/include/linux/sched/core_ctl.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __CORE_CTL_H +#define __CORE_CTL_H + +#ifdef CONFIG_SCHED_CORE_CTL +void core_ctl_check(u64 wallclock); +int core_ctl_set_boost(bool boost); +#else +static inline void core_ctl_check(u64 wallclock) {} +static inline int core_ctl_set_boost(bool boost) +{ + return 0; +} +#endif +#endif diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 024fb1007c78..5276061a2003 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include @@ -85,7 +86,6 @@ #endif #include "sched.h" -#include "core_ctl.h" #include "../workqueue_internal.h" #include "../smpboot.h" diff --git a/kernel/sched/core_ctl.h b/kernel/sched/core_ctl.h deleted file mode 100644 index 98d7cb3e899b..000000000000 --- a/kernel/sched/core_ctl.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2016, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __CORE_CTL_H -#define __CORE_CTL_H - -#ifdef CONFIG_SCHED_CORE_CTL -void core_ctl_check(u64 wallclock); -int core_ctl_set_boost(bool boost); -#else -static inline void core_ctl_check(u64 wallclock) {} -static inline int core_ctl_set_boost(bool boost) -{ - return 0; -} -#endif -#endif diff --git a/kernel/sched/hmp.c b/kernel/sched/hmp.c index 3d5de8ba70a2..c89dda673525 100644 --- a/kernel/sched/hmp.c +++ b/kernel/sched/hmp.c @@ -18,9 +18,9 @@ #include #include #include +#include #include "sched.h" -#include "core_ctl.h" #include -- cgit v1.2.3