Commit-ID: b78f3f3c898c824bf56ab55cfa59fc72be49c349 Gitweb: http://git.kernel.org/tip/b78f3f3c898c824bf56ab55cfa59fc72be49c349 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 7 Jul 2015 16:34:32 +0200 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Suzuki Poulose <Suzuki.Poulose@xxxxxxx> Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@xxxxxxx> Cc: Catalin Marinas <Catalin.Marinas@xxxxxxx> Cc: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Preeti U Murthy <preeti@xxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|