Patched in Tegra support.

2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig
index 99ebdde590f..2dcdbc9364d 100644
--- a/drivers/virt/Kconfig
+++ b/drivers/virt/Kconfig
@@ -15,7 +15,6 @@ if VIRT_DRIVERS
 config FSL_HV_MANAGER
         tristate "Freescale hypervisor management driver"
         depends on FSL_SOC
-        select EPAPR_PARAVIRT
         help
           The Freescale hypervisor management driver provides several services
           to drivers and applications related to the Freescale hypervisor:
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index d294f67d6f8..3d9162151fd 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -706,7 +706,6 @@ static const struct file_operations fsl_hv_fops = {
         .poll = fsl_hv_poll,
         .read = fsl_hv_read,
         .unlocked_ioctl = fsl_hv_ioctl,
-        .compat_ioctl = fsl_hv_ioctl,
 };
 
 static struct miscdevice fsl_hv_misc_dev = {
@@ -796,6 +795,9 @@ 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;