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

Commit 7dbcbcd2 authored by Satya Durga Srinivasu Prabhala's avatar Satya Durga Srinivasu Prabhala Committed by Pavankumar Kondeti
Browse files

sched/fair: fix issue with max_capacity 



While integrating 'commit f6df9e001b5886e ("sched: add cpu isolation
support")' merge conflict incorrectly resolved for max_capacity
where min macro used instead of max macro. Correct it by replacing
min with max macro.

Change-Id: I5de97ee92d5d21f8997091457a2eda87c236a741
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Signed-off-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
parent 2df7c68f

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -9186,7 +9186,7 @@ void update_group_capacity(struct sched_domain *sd, int cpu) 
				capacity += sgc->capacity;

				min_capacity = min(sgc->min_capacity,

							min_capacity);

				max_capacity = min(sgc->max_capacity,

				max_capacity = max(sgc->max_capacity,

							max_capacity);

			}

			group = group->next;