Merge "core_ctl: Handle only CPU_ONLINE and CPU_DEAD notifications" into msm-4.9 (bd7e4ef4) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/sched/core_ctl.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -893,10 +893,9 @@ static int __ref cpu_callback(struct notifier_block *nfb,
		struct cpu_data *state = &per_cpu(cpu_state, cpu);
		struct cluster_data *cluster = state->cluster;
		unsigned int need;
		int ret = NOTIFY_OK;

		if (unlikely(!cluster \|\| !cluster->inited))
		return NOTIFY_OK;
		return NOTIFY_DONE;

		switch (action & ~CPU_TASKS_FROZEN) {
		case CPU_ONLINE:
		@@ -927,13 +926,15 @@ static int __ref cpu_callback(struct notifier_block *nfb,
		state->busy = 0;
		cluster->active_cpus = get_active_cpu_count(cluster);
		break;
		default:
		return NOTIFY_DONE;
		}

		need = apply_limits(cluster, cluster->need_cpus);
		if (adjustment_possible(cluster, need))
		wake_up_core_ctl_thread(cluster);

		return ret;
		return NOTIFY_OK;
		}

		static struct notifier_block __refdata cpu_notifier = {