aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/virt
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2012-05-17 15:10:27 -0400
committerKumar Gala <galak@kernel.crashing.org>2012-11-25 08:00:22 -0500
commit9655aa6b8034ebb69724dc4b54ad4f64a53096d1 (patch)
tree41edbef893b343a1e092991f35f9f3b5eaf8b9a4 /drivers/virt
parente9c36b0b09f29f4edefa5bfcbc7247bb8419edce (diff)
drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
The MSR[GS] bit indicates whether the kernel is running in processor guest state mode, but such a check is unnecessary. The driver already checks for the /hypervisor node and the fsl,hv-version property, so it already knows that it's running under the Freescale hypervisor. There is nothing in the driver that inherently requires guest state, anyway. This fixes a break that can occur in some randconfig builds. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/virt')
-rw-r--r--drivers/virt/fsl_hypervisor.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index 4939e0ccc4e5..d294f67d6f84 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -796,9 +796,6 @@ static int has_fsl_hypervisor(void)
796 struct device_node *node; 796 struct device_node *node;
797 int ret; 797 int ret;
798 798
799 if (!(mfmsr() & MSR_GS))
800 return 0;
801
802 node = of_find_node_by_path("/hypervisor"); 799 node = of_find_node_by_path("/hypervisor");
803 if (!node) 800 if (!node)
804 return 0; 801 return 0;