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

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

Merge "core_ctrl: Move core control into kernel"

parents a18b94fe 59f16ae0
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ CONFIG_TRACER_PKT=y
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
CONFIG_QCOM_REMOTEQDSS=y
CONFIG_MSM_SERVICE_NOTIFIER=y
CONFIG_MEM_SHARE_QMI_SERVICE=y
+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ CONFIG_TRACER_PKT=y
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
CONFIG_QCOM_REMOTEQDSS=y
CONFIG_MSM_SERVICE_NOTIFIER=y
CONFIG_MEM_SHARE_QMI_SERVICE=y
+10 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@
#include <linux/kallsyms.h>
#include <linux/proc_fs.h>
#include <linux/export.h>
#include <linux/cpumask.h>

#include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/cache-uniphier.h>
@@ -127,6 +128,7 @@ static bool migrate_one_irq(struct irq_desc *desc)
	const struct cpumask *affinity = irq_data_get_affinity_mask(d);
	struct irq_chip *c;
	bool ret = false;
	struct cpumask available_cpus;

	/*
	 * If this is a per-CPU interrupt, or the affinity does not
@@ -135,7 +137,14 @@ static bool migrate_one_irq(struct irq_desc *desc)
	if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity))
		return false;

	cpumask_copy(&available_cpus, affinity);
	cpumask_andnot(&available_cpus, &available_cpus, cpu_isolated_mask);
	affinity = &available_cpus;

	if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
		cpumask_andnot(&available_cpus, cpu_online_mask,
			       cpu_isolated_mask);
		if (cpumask_empty(affinity))
			affinity = cpu_online_mask;
		ret = true;
	}
+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y
CONFIG_TRACER_PKT=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_AVTIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y
CONFIG_MSM_RPM_LOG=y
CONFIG_MSM_RPM_STATS_LOG=y
+0 −1
Original line number Diff line number Diff line
@@ -527,7 +527,6 @@ CONFIG_TRACER_PKT=y
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_AVTIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
CONFIG_QCOM_REMOTEQDSS=y
CONFIG_MSM_SERVICE_NOTIFIER=y
CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y
Loading