---

yaml --- r: 155695 b: refs/heads/master c: 79ef2bb h: refs/heads/master i: 155693: 5c7fb2e 155691: 24e8fad 155687: 7144c9a 155679: 0a4d277 v: v3
git-mirror · Jul 19, 2009 · 85716c1 · 85716c1
1 parent 00d42b0
commit 85716c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4841158b26e28e1476eed84c7347c18f11317750
+refs/heads/master: 79ef2bb01445400def20c7993b27fbcad27ca95f
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
@@ -513,7 +513,7 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev,
 	 * Check to make sure we don't switch to a non-highres capable
 	 * clocksource if the tick code is in oneshot mode (highres or nohz)
 	 */
-	if (tick_oneshot_mode_active() &&
+	if (tick_oneshot_mode_active() && ovr &&
 	    !(ovr->flags & CLOCK_SOURCE_VALID_FOR_HRES)) {
 		printk(KERN_WARNING "%s clocksource is not HRT compatible. "
 			"Cannot switch while in HRT/NOHZ mode\n", ovr->name);