diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2017-01-19 11:51:49 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-20 14:48:03 +0100 |
commit | 73638cddaad861a5ebb2b119d8b318d4bded8f8d (patch) | |
tree | e9d9d003f6b14b8fd7d29b4e99f2aa174659bd50 /drivers/hv | |
parent | d058fa7e98ff01a4b4750a2210fc19906db3cbe1 (diff) | |
download | linux-73638cddaad861a5ebb2b119d8b318d4bded8f8d.tar.bz2 |
Drivers: hv: vmbus: Move the check for hypercall page setup
As part of the effort to separate out architecture specific code, move the
check for detecting if the hypercall page is setup.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r-- | drivers/hv/hv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 9985a347ed03..d28a8731baa0 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -49,7 +49,6 @@ struct hv_context hv_context = { */ int hv_init(void) { - union hv_x64_msr_hypercall_contents hypercall_msr; memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS); memset(hv_context.synic_message_page, 0, @@ -65,11 +64,7 @@ int hv_init(void) memset(hv_context.clk_evt, 0, sizeof(void *) * NR_CPUS); - /* See if the hypercall page is already set */ - hypercall_msr.as_uint64 = 0; - rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); - - if (!hypercall_msr.enable) + if (!hv_is_hypercall_page_setup()) return -ENOTSUPP; return 0; |