From b2a3caa70b75c349630c60b07026948becf1b5af Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Thu, 17 May 2012 14:10:27 -0500
Subject: [PATCH] --- yaml --- r: 346826 b: refs/heads/master c:
 9655aa6b8034ebb69724dc4b54ad4f64a53096d1 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/virt/fsl_hypervisor.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b4f12c1d8b91..4813f51c938c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9c36b0b09f29f4edefa5bfcbc7247bb8419edce
+refs/heads/master: 9655aa6b8034ebb69724dc4b54ad4f64a53096d1
diff --git a/trunk/drivers/virt/fsl_hypervisor.c b/trunk/drivers/virt/fsl_hypervisor.c
index 4939e0ccc4e5..d294f67d6f84 100644
--- a/trunk/drivers/virt/fsl_hypervisor.c
+++ b/trunk/drivers/virt/fsl_hypervisor.c
@@ -796,9 +796,6 @@ static int has_fsl_hypervisor(void)
 	struct device_node *node;
 	int ret;
 
-	if (!(mfmsr() & MSR_GS))
-		return 0;
-
 	node = of_find_node_by_path("/hypervisor");
 	if (!node)
 		return 0;