From 5e2f5f12ee05f99f2ac909feae2077b64d6fb607 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Thu, 26 Apr 2012 10:52:27 -0700 Subject: [PATCH] --- yaml --- r: 302751 b: refs/heads/master c: 048a0e8f5e1d94c01a5fc70f5b2f2fd2f4527326 h: refs/heads/master i: 302749: df97b81ab11f932ebebc201a0c21fefcfa8247a4 302747: 0c2e4c2e6cccd75f96d08d38ba9a46778277dc5c 302743: 37e03ee4b22310fbede12eeb129cde902a4ebb15 302735: c1fc25c4600b48984c359637bf699b6447d32c5b 302719: 04fb773c861b88c69f43c8b774728f1a19cdfed0 v: v3 --- [refs] | 2 +- trunk/kernel/timer.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 78220355dc0f..ef88aa3923f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d8133919bac4270883b24328500875a49e71b36 +refs/heads/master: 048a0e8f5e1d94c01a5fc70f5b2f2fd2f4527326 diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index a297ffcf888e..837c552fe838 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -861,7 +861,13 @@ EXPORT_SYMBOL(mod_timer); * * mod_timer_pinned() is a way to update the expire field of an * active timer (if the timer is inactive it will be activated) - * and not allow the timer to be migrated to a different CPU. + * and to ensure that the timer is scheduled on the current CPU. + * + * Note that this does not prevent the timer from being migrated + * when the current CPU goes offline. If this is a problem for + * you, use CPU-hotplug notifiers to handle it correctly, for + * example, cancelling the timer when the corresponding CPU goes + * offline. * * mod_timer_pinned(timer, expires) is equivalent to: *