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

Commit 6cb3dd75 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.2-rc1' of... 

Merge tag 'timers-v5.2-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull timer fixes from Daniel Lezcano:
  - Fix missing notrace leading to deadlock on arch_arm_timer (Julien Thierry)
  - Fix compilation warning on timer-ti-dm (Philippe Mazenauer)
parents 4dde821e 5d6168fc

drivers/clocksource/arm_arch_timer.c

+4 −4
Original line number Diff line number Diff line
@@ -149,22 +149,22 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg, 
	return val;

}



static u64 arch_counter_get_cntpct_stable(void)

static notrace u64 arch_counter_get_cntpct_stable(void)

{

	return __arch_counter_get_cntpct_stable();

}



static u64 arch_counter_get_cntpct(void)

static notrace u64 arch_counter_get_cntpct(void)

{

	return __arch_counter_get_cntpct();

}



static u64 arch_counter_get_cntvct_stable(void)

static notrace u64 arch_counter_get_cntvct_stable(void)

{

	return __arch_counter_get_cntvct_stable();

}



static u64 arch_counter_get_cntvct(void)

static notrace u64 arch_counter_get_cntvct(void)

{

	return __arch_counter_get_cntvct();

}

drivers/clocksource/timer-ti-dm.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static int omap_dm_timer_remove(struct platform_device *pdev) 
	return ret;

}



const static struct omap_dm_timer_ops dmtimer_ops = {

static const struct omap_dm_timer_ops dmtimer_ops = {

	.request_by_node = omap_dm_timer_request_by_node,

	.request_specific = omap_dm_timer_request_specific,

	.request = omap_dm_timer_request,