bus: arm-ccn: Handle correctly no-more-cpus case
authorPawel Moll <pawel.moll@arm.com>
Thu, 15 Oct 2015 13:32:45 +0000 (14:32 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Oct 2015 15:10:02 +0000 (17:10 +0200)
When migrating events the driver picks another cpu using
cpumask_any_but() function, which returns value >= nr_cpu_ids
when there is none available, not a negative value as the code
assumed. Fixed now.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/bus/arm-ccn.c

index 7d9879e166cf4c4346402cb353ef3cd002483740..cc322fbde9af69c78f85b359253ea5d8d32f3588 100644 (file)
@@ -1184,7 +1184,7 @@ static int arm_ccn_pmu_cpu_notifier(struct notifier_block *nb,
                if (!cpumask_test_and_clear_cpu(cpu, &dt->cpu))
                        break;
                target = cpumask_any_but(cpu_online_mask, cpu);
-               if (target < 0)
+               if (target >= nr_cpu_ids)
                        break;
                perf_pmu_migrate_context(&dt->pmu, cpu, target);
                cpumask_set_cpu(target, &dt->cpu);