From 10ea7a3a7f7c3836e9997227a080f4c3839c957f Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Wed, 18 Apr 2012 19:27:39 -0700
Subject: [PATCH] --- yaml --- r: 299667 b: refs/heads/master c:
 a6371f80230eaaafd7eef7efeedaa9509bdc982d h: refs/heads/master i:   299665:
 601c4fa3fa08368d49896523e6ce60f330ee806d   299663:
 a02f2ce85e266fdb50208a79b6f0678591351f16 v: v3

---
 [refs]                             | 2 +-
 trunk/kernel/time/tick-broadcast.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e576fed05ac8..a66032f9611a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a6a23566960d0dd3f51e2e68b472cd61911078
+refs/heads/master: a6371f80230eaaafd7eef7efeedaa9509bdc982d
diff --git a/trunk/kernel/time/tick-broadcast.c b/trunk/kernel/time/tick-broadcast.c
index 029531f3818c..f113755695e2 100644
--- a/trunk/kernel/time/tick-broadcast.c
+++ b/trunk/kernel/time/tick-broadcast.c
@@ -346,7 +346,8 @@ int tick_resume_broadcast(void)
 						     tick_get_broadcast_mask());
 			break;
 		case TICKDEV_MODE_ONESHOT:
-			broadcast = tick_resume_broadcast_oneshot(bc);
+			if (!cpumask_empty(tick_get_broadcast_mask()))
+				broadcast = tick_resume_broadcast_oneshot(bc);
 			break;
 		}
 	}