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

Commit cad0e458 authored by Mike Travis's avatar Mike Travis Committed by Thomas Gleixner
Browse files

clocksource/events: use performance variant for_each_cpu_mask_nr 



Change references from for_each_cpu_mask to for_each_cpu_mask_nr
where appropriate

Reviewed-by: default avatarPaul Jackson <pj@sgi.com>
Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5d7bfd0c

kernel/time/clocksource.c

+2 −2
Original line number Diff line number Diff line
@@ -145,9 +145,9 @@ static void clocksource_watchdog(unsigned long data) 
		 * Cycle through CPUs to check if the CPUs stay

		 * synchronized to each other.

		 */

		int next_cpu = next_cpu(raw_smp_processor_id(), cpu_online_map);

		int next_cpu = next_cpu_nr(raw_smp_processor_id(), cpu_online_map);



		if (next_cpu >= NR_CPUS)

		if (next_cpu >= nr_cpu_ids)

			next_cpu = first_cpu(cpu_online_map);

		watchdog_timer.expires += WATCHDOG_INTERVAL;

		add_timer_on(&watchdog_timer, next_cpu);

kernel/time/tick-broadcast.c

+1 −2
Original line number Diff line number Diff line
@@ -397,8 +397,7 @@ static void tick_handle_oneshot_broadcast(struct clock_event_device *dev) 
	mask = CPU_MASK_NONE;

	now = ktime_get();

	/* Find all expired events */

	for (cpu = first_cpu(tick_broadcast_oneshot_mask); cpu != NR_CPUS;

	     cpu = next_cpu(cpu, tick_broadcast_oneshot_mask)) {

	for_each_cpu_mask_nr(cpu, tick_broadcast_oneshot_mask) {

		td = &per_cpu(tick_cpu_device, cpu);

		if (td->evtdev->next_event.tv64 <= now.tv64)

			cpu_set(cpu, mask);