diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:40 +0200 |
| commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
| tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /arch/x86/hyperv/hv_init.c | |
| parent | fa84cf094ef9667e2b91c104b0a788fd1896f482 (diff) | |
| parent | 4aaf448fa9754e2d5ee188d32327b24ffc15ca4d (diff) | |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/x86/hyperv/hv_init.c')
| -rw-r--r-- | arch/x86/hyperv/hv_init.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 4c431e1c1effc..1ff420217298e 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -265,7 +265,7 @@ void __init hyperv_init(void) { u64 guest_id, required_msrs; union hv_x64_msr_hypercall_contents hypercall_msr; - int cpuhp; + int cpuhp, i; if (x86_hyper_type != X86_HYPER_MS_HYPERV) return; @@ -293,6 +293,9 @@ void __init hyperv_init(void) if (!hv_vp_index) return; + for (i = 0; i < num_possible_cpus(); i++) + hv_vp_index[i] = VP_INVAL; + hv_vp_assist_page = kcalloc(num_possible_cpus(), sizeof(*hv_vp_assist_page), GFP_KERNEL); if (!hv_vp_assist_page) { |