Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A simple fix to actually shut down a detached device instead of
keeping it active"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents: Shutdown detached clockevent device
+1
-5
+1
-5
kernel/time/clockevents.c
+1
-5
kernel/time/clockevents.c
···
117
117
/* Transition with new state-specific callbacks */
118
118
switch (state) {
119
119
case CLOCK_EVT_STATE_DETACHED:
120
-
/*
121
-
* This is an internal state, which is guaranteed to go from
122
-
* SHUTDOWN to DETACHED. No driver interaction required.
123
-
*/
124
-
return 0;
120
+
/* The clockevent device is getting replaced. Shut it down. */
125
121
126
122
case CLOCK_EVT_STATE_SHUTDOWN:
127
123
return dev->set_state_shutdown(dev);