tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
"A single clocksource driver suspend/resume fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents/drivers/sh_cmt: Only perform clocksource suspend/resume if enabled

Linus Torvalds 3670901f b25c6cee

+6
+6
drivers/clocksource/sh_cmt.c
··· 661 661 { 662 662 struct sh_cmt_channel *ch = cs_to_sh_cmt(cs); 663 663 664 + if (!ch->cs_enabled) 665 + return; 666 + 664 667 sh_cmt_stop(ch, FLAG_CLOCKSOURCE); 665 668 pm_genpd_syscore_poweroff(&ch->cmt->pdev->dev); 666 669 } ··· 671 668 static void sh_cmt_clocksource_resume(struct clocksource *cs) 672 669 { 673 670 struct sh_cmt_channel *ch = cs_to_sh_cmt(cs); 671 + 672 + if (!ch->cs_enabled) 673 + return; 674 674 675 675 pm_genpd_syscore_poweron(&ch->cmt->pdev->dev); 676 676 sh_cmt_start(ch, FLAG_CLOCKSOURCE);