Commit eea8bebd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers_urgent_for_v6.1_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Borislav Petkov:

 - Revert a fix to RISC-V timers supposed to address an uncertainty
   whether clock events are received during S3 or not which locks up
   other RISC-V platforms. The issue will be fixed differently later.

* tag 'timers_urgent_for_v6.1_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "clocksource/drivers/riscv: Events are stopped during CPU suspend"
parents ae6bb717 d9f15a9d

drivers/clocksource/timer-riscv.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int riscv_clock_next_event(unsigned long delta, 
static unsigned int riscv_clock_event_irq;

static DEFINE_PER_CPU(struct clock_event_device, riscv_clock_event) = {

	.name			= "riscv_timer_clockevent",

	.features		= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP,

	.features		= CLOCK_EVT_FEAT_ONESHOT,

	.rating			= 100,

	.set_next_event		= riscv_clock_next_event,

};