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

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

Merge "timer: Do not require CPUSETS to be enabled for migration"

parents bc3e40b9 7486ba73

kernel/time/hrtimer.c

+3 −6
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ int hrtimers_prepare_cpu(unsigned int cpu) 
	return 0;

}



#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_CPUSETS)

#ifdef CONFIG_HOTPLUG_CPU

static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,

				 struct hrtimer_clock_base *new_base,

				 bool remove_pinned)
@@ -1685,9 +1685,7 @@ static void __migrate_hrtimers(unsigned int scpu, bool remove_pinned) 
	__hrtimer_peek_ahead_timers();

	local_irq_restore(flags);

}

#endif /* CONFIG_HOTPLUG_CPU || CONFIG_CPUSETS */



#ifdef CONFIG_HOTPLUG_CPU

int hrtimers_dead_cpu(unsigned int scpu)

{

	BUG_ON(cpu_online(scpu));
@@ -1696,14 +1694,13 @@ int hrtimers_dead_cpu(unsigned int scpu) 
	__migrate_hrtimers(scpu, true);

	return 0;

}

#endif /* CONFIG_HOTPLUG_CPU */



#ifdef CONFIG_CPUSETS

void hrtimer_quiesce_cpu(void *cpup)

{

	__migrate_hrtimers(*(int *)cpup, false);

}

#endif /* CONFIG_CPUSETS */



#endif /* CONFIG_HOTPLUG_CPU */



void __init hrtimers_init(void)

{

kernel/time/timer.c

+0 −2
Original line number Diff line number Diff line
@@ -1886,12 +1886,10 @@ int timers_dead_cpu(unsigned int cpu) 
	return 0;

}



#ifdef CONFIG_CPUSETS

void timer_quiesce_cpu(void *cpup)

{

	__migrate_timers(*(unsigned int *)cpup, false);

}

#endif /* CONFIG_CPUSETS */



#endif /* CONFIG_HOTPLUG_CPU */