From: Greg Hackmann <ghackmann@google.com>
Date: Tue, 7 Mar 2017 18:37:56 +0000 (-0800)
Subject: ANDROID: sched: fix duplicate sched_group_energy const specifiers
X-Git-Tag: release-20171130_firefly~4^2~100^2~191
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eddcde3031dd40ec6f881a4b87a80f17b7239dd5;p=firefly-linux-kernel-4.4.55.git

ANDROID: sched: fix duplicate sched_group_energy const specifiers

EAS uses "const struct sched_group_energy * const" fairly consistently.
But a couple of places swap the "*" and second "const", making the
pointer mutable.

In the case of struct sched_group, "* const" would have been an error,
since init_sched_energy() writes to sd->groups->sge.

Change-Id: Ic6a8fcf99e65c0f25d9cc55c32625ef3ca5c9aca
Signed-off-by: Greg Hackmann <ghackmann@google.com>
---

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 3331f453a17f..83cfb72b2d95 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4919,7 +4919,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 * const sge)
 {
 	int idx;
 	unsigned long util = group_max_util(eenv);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 2f2b959ad244..780522c65cea 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -915,7 +915,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.