diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 23:25:25 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 23:25:25 +0100 |
| commit | 3991782ea3e41412f8a665cd6ce66943d76aff8a (patch) | |
| tree | cb4287612e4a23a2f663a9be910ff9cb8365563b /drivers | |
| parent | Merge branch 'merge' into next (diff) | |
| parent | powerpc/dma/raidengine: add raidengine device (diff) | |
| download | linux-3991782ea3e41412f8a665cd6ce66943d76aff8a.tar.xz linux-3991782ea3e41412f8a665cd6ce66943d76aff8a.zip | |
Merge remote-tracking branch 'kumar/next' into next
Freescale updates from Kumar
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/virt/fsl_hypervisor.c | 3 |
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; |