Messages in this thread Patch in this message | | | Date | Tue, 7 Jul 2015 10:13:34 -0700 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:timers/urgent] tick/broadcast: Prevent deep idle if no broadcast device available |
| |
Commit-ID: b78f3f3c898c824bf56ab55cfa59fc72be49c349 Gitweb: http://git.kernel.org/tip/b78f3f3c898c824bf56ab55cfa59fc72be49c349 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 7 Jul 2015 16:34:32 +0200 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 7 Jul 2015 18:46:47 +0200
tick/broadcast: Prevent deep idle if no broadcast device available
Add a check for a installed broadcast device to the oneshot control function and return busy if not.
[ Split out from a larger combo patch ]
Reported-and-tested-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Suzuki Poulose <Suzuki.Poulose@arm.com> Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> Cc: Catalin Marinas <Catalin.Marinas@arm.com> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1507070929360.3916@nanos --- kernel/time/tick-broadcast.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index ef77b16..fad3f78 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -693,6 +693,13 @@ int __tick_broadcast_oneshot_control(enum tick_broadcast_state state) ktime_t now; /* + * If there is no broadcast device, tell the caller not to go + * into deep idle. + */ + if (!tick_broadcast_device.evtdev) + return -EBUSY; + + /* * Periodic mode does not care about the enter/exit of power * states */
| |