PKGBUILDs/core/linux-oak/0012-sched-fix-duplicate-const-error-on-gcc-7.patch
2017-07-21 04:06:40 +00:00

42 lines
1.2 KiB
Diff

From fad3c0ed1105d615614816b93c748b51bfbd1b59 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 20 Jul 2017 20:51:05 -0600
Subject: [PATCH 12/13] sched: fix duplicate const error on gcc 7
Fixes f0e1f11d3d18.
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
kernel/sched/fair.c | 2 +-
kernel/sched/sched.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 358cc04b1096..16d5ddb38d41 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4626,7 +4626,7 @@ long group_norm_util(struct energy_env *eenv, struct sched_group *sg)
}
static int find_new_capacity(struct energy_env *eenv,
- const struct sched_group_energy const *sge)
+ const struct sched_group_energy *sge)
{
int idx;
unsigned long util = group_max_util(eenv);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 544f0ac239bd..a2cb67fbcdaa 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -820,7 +820,7 @@ struct sched_group {
unsigned int group_weight;
struct sched_group_capacity *sgc;
- const struct sched_group_energy const *sge;
+ const struct sched_group_energy *sge;
/*
* The CPUs this group covers.
--
2.13.3