Messages in this thread Patch in this message | | | Date | Sat, 4 Oct 2008 00:22:44 +0200 (CEST) | From | Thomas Gleixner <> | Subject | Re: 2.6.27-rc8 doubled times |
| |
On Fri, 3 Oct 2008, Hugh Dickins wrote: > Hi Thomas, > > Please would you take another look at your -rc8 commit > 302745699c1b675b5d2a1af87271de10e4d96b6a clockevents: > check broadcast device not tick device.
Bummer. I can swear that I had a fix for this in the quilt queue before I applied it to the git tree.
The correct fix is below.
Thanks for spotting this.
tglx --- diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index bd70345..cb01cd8 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -235,7 +235,8 @@ static void tick_do_broadcast_on_off(void *why) case CLOCK_EVT_NOTIFY_BROADCAST_FORCE: if (!cpu_isset(cpu, tick_broadcast_mask)) { cpu_set(cpu, tick_broadcast_mask); - if (bc->mode == TICKDEV_MODE_PERIODIC) + if (tick_broadcast_device.mode == + TICKDEV_MODE_PERIODIC) clockevents_shutdown(dev); } if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE) @@ -245,7 +246,8 @@ static void tick_do_broadcast_on_off(void *why) if (!tick_broadcast_force && cpu_isset(cpu, tick_broadcast_mask)) { cpu_clear(cpu, tick_broadcast_mask); - if (bc->mode == TICKDEV_MODE_PERIODIC) + if (tick_broadcast_device.mode == + TICKDEV_MODE_PERIODIC) tick_setup_periodic(dev, 0); } break;
| |