diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-08-25 18:30:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-08-25 18:30:32 +1000 |
| commit | b1bf8c4bc85b25eb7f71c83c40927875041a6327 (patch) | |
| tree | 436d01dd9260628b002a1036e7c0a4ef8154c0bb /kernel/time/clocksource.c | |
| parent | b887830e014b4fe8e943c1b44325b725e139d70d (diff) | |
| parent | dc22fb4b2b1699748407ebdc712d9039b337c058 (diff) | |
| download | linux-next-b1bf8c4bc85b25eb7f71c83c40927875041a6327.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index b038b81f8d32..2f170383b00a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -262,7 +262,7 @@ static void clocksource_verify_choose_cpus(void) return; /* Make sure to select at least one CPU other than the current CPU. */ - cpu = cpumask_next(-1, cpu_online_mask); + cpu = cpumask_first(cpu_online_mask); if (cpu == smp_processor_id()) cpu = cpumask_next(cpu, cpu_online_mask); if (WARN_ON_ONCE(cpu >= nr_cpu_ids)) @@ -284,7 +284,7 @@ static void clocksource_verify_choose_cpus(void) cpu = prandom_u32() % nr_cpu_ids; cpu = cpumask_next(cpu - 1, cpu_online_mask); if (cpu >= nr_cpu_ids) - cpu = cpumask_next(-1, cpu_online_mask); + cpu = cpumask_first(cpu_online_mask); if (!WARN_ON_ONCE(cpu >= nr_cpu_ids)) cpumask_set_cpu(cpu, &cpus_chosen); } |