From 8c4b1588e1f4435b456ac9a47dfece58f5482eb4 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 21 Jul 2010 18:32:37 +0100
Subject: [PATCH] --- yaml --- r: 201303 b: refs/heads/master c:
 ff4878089e1eaeac79d57878ad4ea32910fb4037 h: refs/heads/master i:   201301:
 c318f859b7c9c63971b41a392849ffd6b5ff80f7   201299:
 0c1f99e53336422b2f5fad0c0505384bfe220ef5   201295:
 8d6a800e4a9bcc60d8245b89980a7c36ba0cdc65 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/hpet.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04465a091ec6..3453ed219315 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 087b255a2b43f417af83cb44e0bb02507f36b7fe
+refs/heads/master: ff4878089e1eaeac79d57878ad4ea32910fb4037
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
index a198b7c87a12..ba390d731175 100644
--- a/trunk/arch/x86/kernel/hpet.c
+++ b/trunk/arch/x86/kernel/hpet.c
@@ -964,7 +964,7 @@ fs_initcall(hpet_late_init);
 
 void hpet_disable(void)
 {
-	if (is_hpet_capable()) {
+	if (is_hpet_capable() && hpet_virt_address) {
 		unsigned int cfg = hpet_readl(HPET_CFG);
 
 		if (hpet_legacy_int_enabled) {