---

yaml --- r: 299667 b: refs/heads/master c: a6371f8 h: refs/heads/master i: 299665: 601c4fa 299663: a02f2ce v: v3
git-mirror · Apr 19, 2012 · 10ea7a3 · 10ea7a3
1 parent e98ffbc
commit 10ea7a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 		}
 	}