From 85716c10a7254cc816e9e33a0593cbe7d3153117 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 19 Jul 2009 17:09:12 +0200
Subject: [PATCH] --- yaml --- r: 155695 b: refs/heads/master c:
 79ef2bb01445400def20c7993b27fbcad27ca95f h: refs/heads/master i:   155693:
 5c7fb2e91ac7abd6d9d4ea11b604be336ab6d61b   155691:
 24e8fadf2b951f1f59844832984842fda1ea820d   155687:
 7144c9ad9b2ec89f62715f9e0feb3340da3dfd60   155679:
 0a4d27721cc6aabfb091ab59a41b524ad5af0a0e v: v3

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

diff --git a/[refs] b/[refs]
index 5b6b885dc546..aa60fd782528 100644
--- 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
index 592bf584d1d2..7466cb811251 100644
--- 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);