Signed-off-by: Lukasz Luba l.luba@partner.samsung.com --- kernel/sched/power.c | 4 ++-- kernel/sched/sched.h | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/power.c b/kernel/sched/power.c index c9893c86efe6..89e447d442cd 100644 --- a/kernel/sched/power.c +++ b/kernel/sched/power.c @@ -23,7 +23,7 @@ DEFINE_PER_CPU(struct update_sched_power *, update_cpu_power); static struct sched_power sched_power;
void sched_power_set_update_func(int cpu, struct update_sched_power *update, - void (*fn)(struct update_sched_power *, int, unsigned int, int, + void (*fn)(struct update_sched_power *, int, int, int, int)) {
@@ -274,7 +274,7 @@ static void sched_power_irq_work(struct irq_work *irq_work) }
static void sched_power_update(struct update_sched_power *update, int cpu, - unsigned int weight, int flags, int time) + int weight, int flags, int time) { struct cpu_power *cpower = container_of(update, struct cpu_power, update_power); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 725e0c19ae96..ebaf42e81afa 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2249,12 +2249,12 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned #define SCHED_POWER_CLUSTER_REQ 0x2 #ifdef CONFIG_THERMAL struct update_sched_power { - void (*func)(struct update_sched_power *, int, unsigned int, int, int); + void (*func)(struct update_sched_power *, int, int, int, int); }; DECLARE_PER_CPU(struct update_sched_power *, update_cpu_power);
-static inline void sched_power_change_cpu_weight(int cpu, unsigned long weight, - int flags) +static inline +void sched_power_change_cpu_weight(int cpu, int weight, int flags) { struct update_sched_power *update; u64 time = sched_clock(); @@ -2266,15 +2266,16 @@ static inline void sched_power_change_cpu_weight(int cpu, unsigned long weight, }
static inline -void sched_power_change_cluster_weight(int cpu, unsigned long weight, int flags) +void sched_power_change_cluster_weight(int cpu, int weight, int flags) { sched_power_change_cpu_weight(cpu, weight, flags | SCHED_POWER_CLUSTER_REQ); } #else -static inline void sched_power_change_cpu_weight(int cpu, unsigned int weight, - int flags) {} static inline -void sched_power_change_cluster_weight(int cpu, unsigned int weight, int flags) +void sched_power_change_cpu_weight(int cpu, int weight, int flags) {} + +static inline +void sched_power_change_cluster_weight(int cpu, int weight, int flags) {} #endif /* CONFIG_THERMAL */