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

Commit baad4663 authored by Runmin Wang's avatar Runmin Wang
Browse files

timer: Fix incorrect merge resolution 



Merge conflict resolution in commit 5682ea9f
("Merge remote-tracking branch 'remotes/origin/tmp-91891413' into msm-4.14")
has removed necessary changes in timer code.
This change adds the missing code back and fix the resolution in a
correct way.

Change-Id: I4b3994f535d559a6392a7174d6a32e43004c209c
Signed-off-by: default avatarRunmin Wang <runminw@codeaurora.org>
parent 0f6b4ff8

kernel/time/timer.c

+4 −5
Original line number Diff line number Diff line
@@ -830,8 +830,7 @@ static inline struct timer_base *get_timer_cpu_base(u32 tflags, u32 cpu) 
	 * If the timer is deferrable and NO_HZ_COMMON is set then we need

	 * to use the deferrable base.

	 */

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active &&

	    (tflags & TIMER_DEFERRABLE)) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && (tflags & TIMER_DEFERRABLE)) {

		base = &timer_base_deferrable;

		if (tflags & TIMER_PINNED)

			base = per_cpu_ptr(&timer_bases[BASE_DEF], cpu);
@@ -847,8 +846,7 @@ static inline struct timer_base *get_timer_this_cpu_base(u32 tflags) 
	 * If the timer is deferrable and NO_HZ_COMMON is set then we need

	 * to use the deferrable base.

	 */

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active &&

	    (tflags & TIMER_DEFERRABLE)) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && (tflags & TIMER_DEFERRABLE)) {

		base = &timer_base_deferrable;

		if (tflags & TIMER_PINNED)

			base = this_cpu_ptr(&timer_bases[BASE_DEF]);
@@ -1669,7 +1667,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h) 
	base->must_forward_clk = false;



	__run_timers(base);

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON)) {

		__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));

		__run_timers(&timer_base_deferrable);

	}

}