Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249563
b: refs/heads/master
c: 44939d3
h: refs/heads/master
i:
  249561: b4e8baf
  249559: 8d7e717
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent 9a2ea08 commit e6bd4bf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b413bba38452b030d2192becb3865c7f914929d9
refs/heads/master: 44939d37cc03af996d93b9d15385ac13de2bd627
18 changes: 9 additions & 9 deletions trunk/drivers/staging/hv/hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ int hv_init(void)
sizeof(void *) * MAX_NUM_CPUS);

if (!query_hypervisor_presence())
goto Cleanup;
goto cleanup;

max_leaf = query_hypervisor_info();
/* HvQueryHypervisorFeatures(maxLeaf); */
Expand All @@ -172,7 +172,7 @@ int hv_init(void)
rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);

if (hv_context.guestid != 0)
goto Cleanup;
goto cleanup;

/* Write our OS info */
wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
Expand All @@ -188,7 +188,7 @@ int hv_init(void)
virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);

if (!virtaddr)
goto Cleanup;
goto cleanup;

hypercall_msr.enable = 1;

Expand All @@ -200,7 +200,7 @@ int hv_init(void)
rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);

if (!hypercall_msr.enable)
goto Cleanup;
goto cleanup;

hv_context.hypercall_page = virtaddr;

Expand All @@ -209,7 +209,7 @@ int hv_init(void)
kmalloc(sizeof(struct hv_input_signal_event_buffer),
GFP_KERNEL);
if (!hv_context.signal_event_buffer)
goto Cleanup;
goto cleanup;

hv_context.signal_event_param =
(struct hv_input_signal_event *)
Expand All @@ -224,7 +224,7 @@ int hv_init(void)

return ret;

Cleanup:
cleanup:
if (virtaddr) {
if (hypercall_msr.enable) {
hypercall_msr.as_uint64 = 0;
Expand Down Expand Up @@ -345,15 +345,15 @@ void hv_synic_init(void *irqarg)

if (hv_context.synic_message_page[cpu] == NULL) {
pr_err("Unable to allocate SYNIC message page\n");
goto Cleanup;
goto cleanup;
}

hv_context.synic_event_page[cpu] =
(void *)get_zeroed_page(GFP_ATOMIC);

if (hv_context.synic_event_page[cpu] == NULL) {
pr_err("Unable to allocate SYNIC event page\n");
goto Cleanup;
goto cleanup;
}

/* Setup the Synic's message page */
Expand Down Expand Up @@ -391,7 +391,7 @@ void hv_synic_init(void *irqarg)
hv_context.synic_initialized = true;
return;

Cleanup:
cleanup:
if (hv_context.synic_event_page[cpu])
free_page((unsigned long)hv_context.synic_event_page[cpu]);

Expand Down

0 comments on commit e6bd4bf

Please sign in to comment.