summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2012-05-17 14:10:27 -0500
committerKumar Gala <galak@kernel.crashing.org>2012-11-25 07:00:22 -0600
commit9655aa6b8034ebb69724dc4b54ad4f64a53096d1 (patch)
tree41edbef893b343a1e092991f35f9f3b5eaf8b9a4 /drivers
parente9c36b0b09f29f4edefa5bfcbc7247bb8419edce (diff)
downloadlinux-stable-9655aa6b8034ebb69724dc4b54ad4f64a53096d1.tar.gz
linux-stable-9655aa6b8034ebb69724dc4b54ad4f64a53096d1.tar.bz2
linux-stable-9655aa6b8034ebb69724dc4b54ad4f64a53096d1.zip
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')
-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)
struct device_node *node;
int ret;
- if (!(mfmsr() & MSR_GS))
- return 0;
-
node = of_find_node_by_path("/hypervisor");
if (!node)
return 0;