Merge branch 'task-placement-v2' into big-LITTLE-MP-v10big-LITTLE-MP-v10

This merge adds two fixup patches from tixy & morten on task-placement-v2
branch.

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 58dac7a80e5..0b512331c0f 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -396,10 +396,12 @@ void __init arch_get_hmp_domains(struct list_head *hmp_domains_list)
 	 * Must be ordered with respect to compute capacity.
 	 * Fastest domain at head of list.
 	 */
-	domain = (struct hmp_domain *)
-		kmalloc(sizeof(struct hmp_domain), GFP_KERNEL);
-	cpumask_copy(&domain->cpus, &hmp_slow_cpu_mask);
-	list_add(&domain->hmp_domains, hmp_domains_list);
+	if(!cpumask_empty(&hmp_slow_cpu_mask)) {
+		domain = (struct hmp_domain *)
+			kmalloc(sizeof(struct hmp_domain), GFP_KERNEL);
+		cpumask_copy(&domain->cpus, &hmp_slow_cpu_mask);
+		list_add(&domain->hmp_domains, hmp_domains_list);
+	}
 	domain = (struct hmp_domain *)
 		kmalloc(sizeof(struct hmp_domain), GFP_KERNEL);
 	cpumask_copy(&domain->cpus, &hmp_fast_cpu_mask);