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

Commit 66204ed7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "core_ctl: Increase MAX_CPUS_PER_CLUSTER to 6" into msm-4.9

parents 8471f47f 4b62196b

kernel/sched/core_ctl.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 




#include <trace/events/sched.h>

#include <trace/events/sched.h>





#define MAX_CPUS_PER_CLUSTER 4

#define MAX_CPUS_PER_CLUSTER 6

#define MAX_CLUSTERS 2

#define MAX_CLUSTERS 2





struct cluster_data {

struct cluster_data {
@@ -166,7 +166,9 @@ static ssize_t store_busy_up_thres(struct cluster_data *state, 
	unsigned int val[MAX_CPUS_PER_CLUSTER];

	unsigned int val[MAX_CPUS_PER_CLUSTER];

	int ret, i;

	int ret, i;





	ret = sscanf(buf, "%u %u %u %u\n", &val[0], &val[1], &val[2], &val[3]);

	ret = sscanf(buf, "%u %u %u %u %u %u\n",

			&val[0], &val[1], &val[2], &val[3],

			&val[4], &val[5]);

	if (ret != 1 && ret != state->num_cpus)

	if (ret != 1 && ret != state->num_cpus)

		return -EINVAL;

		return -EINVAL;
@@ -199,7 +201,9 @@ static ssize_t store_busy_down_thres(struct cluster_data *state, 
	unsigned int val[MAX_CPUS_PER_CLUSTER];

	unsigned int val[MAX_CPUS_PER_CLUSTER];

	int ret, i;

	int ret, i;





	ret = sscanf(buf, "%u %u %u %u\n", &val[0], &val[1], &val[2], &val[3]);

	ret = sscanf(buf, "%u %u %u %u %u %u\n",

			&val[0], &val[1], &val[2], &val[3],

			&val[4], &val[5]);

	if (ret != 1 && ret != state->num_cpus)

	if (ret != 1 && ret != state->num_cpus)

		return -EINVAL;

		return -EINVAL;
@@ -308,7 +312,9 @@ static ssize_t store_not_preferred(struct cluster_data *state, 
	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;





	ret = sscanf(buf, "%u %u %u %u\n", &val[0], &val[1], &val[2], &val[3]);

	ret = sscanf(buf, "%u %u %u %u %u %u\n",

			&val[0], &val[1], &val[2], &val[3],

			&val[4], &val[5]);

	if (ret != state->num_cpus)

	if (ret != state->num_cpus)

		return -EINVAL;

		return -EINVAL;