diff options
author | Preeti U Murthy <preeti@linux.vnet.ibm.com> | 2014-02-07 03:06:06 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 09:34:29 -0500 |
commit | da7e6f45c34d39186b72328bacc4dd86bff60e0a (patch) | |
tree | 414a48cd4d8c037c704946e10a7d2e12342214d7 /kernel/time/clockevents.c | |
parent | fe79a9ba11962a603fb6af68fcb476e64031e46c (diff) |
time: Change the return type of clockevents_notify() to integer
The broadcast framework can potentially be made use of by archs which do not have an
external clock device as well. Then, it is required that one of the CPUs need
to handle the broadcasting of wakeup IPIs to the CPUs in deep idle. As a
result its local timers should remain functional all the time. For such
a CPU, the BROADCAST_ENTER notification has to fail indicating that its clock
device cannot be shutdown. To make way for this support, change the return
type of tick_broadcast_oneshot_control() and hence clockevents_notify() to
indicate such scenarios.
Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: deepthi@linux.vnet.ibm.com
Cc: paulmck@linux.vnet.ibm.com
Cc: fweisbec@gmail.com
Cc: paulus@samba.org
Cc: srivatsa.bhat@linux.vnet.ibm.com
Cc: svaidy@linux.vnet.ibm.com
Cc: peterz@infradead.org
Cc: benh@kernel.crashing.org
Cc: rafael.j.wysocki@intel.com
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/20140207080606.17187.78306.stgit@preeti.in.ibm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/clockevents.c')
-rw-r--r-- | kernel/time/clockevents.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index f85e5fda9c66..ad362c260ef4 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
@@ -542,12 +542,13 @@ void clockevents_resume(void) | |||
542 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | 542 | #ifdef CONFIG_GENERIC_CLOCKEVENTS |
543 | /** | 543 | /** |
544 | * clockevents_notify - notification about relevant events | 544 | * clockevents_notify - notification about relevant events |
545 | * Returns 0 on success, any other value on error | ||
545 | */ | 546 | */ |
546 | void clockevents_notify(unsigned long reason, void *arg) | 547 | int clockevents_notify(unsigned long reason, void *arg) |
547 | { | 548 | { |
548 | struct clock_event_device *dev, *tmp; | 549 | struct clock_event_device *dev, *tmp; |
549 | unsigned long flags; | 550 | unsigned long flags; |
550 | int cpu; | 551 | int cpu, ret = 0; |
551 | 552 | ||
552 | raw_spin_lock_irqsave(&clockevents_lock, flags); | 553 | raw_spin_lock_irqsave(&clockevents_lock, flags); |
553 | 554 | ||
@@ -560,7 +561,7 @@ void clockevents_notify(unsigned long reason, void *arg) | |||
560 | 561 | ||
561 | case CLOCK_EVT_NOTIFY_BROADCAST_ENTER: | 562 | case CLOCK_EVT_NOTIFY_BROADCAST_ENTER: |
562 | case CLOCK_EVT_NOTIFY_BROADCAST_EXIT: | 563 | case CLOCK_EVT_NOTIFY_BROADCAST_EXIT: |
563 | tick_broadcast_oneshot_control(reason); | 564 | ret = tick_broadcast_oneshot_control(reason); |
564 | break; | 565 | break; |
565 | 566 | ||
566 | case CLOCK_EVT_NOTIFY_CPU_DYING: | 567 | case CLOCK_EVT_NOTIFY_CPU_DYING: |
@@ -603,6 +604,7 @@ void clockevents_notify(unsigned long reason, void *arg) | |||
603 | break; | 604 | break; |
604 | } | 605 | } |
605 | raw_spin_unlock_irqrestore(&clockevents_lock, flags); | 606 | raw_spin_unlock_irqrestore(&clockevents_lock, flags); |
607 | return ret; | ||
606 | } | 608 | } |
607 | EXPORT_SYMBOL_GPL(clockevents_notify); | 609 | EXPORT_SYMBOL_GPL(clockevents_notify); |
608 | 610 | ||