From e6bd4bffa90bd1929af313b472533c3c5d49a671 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:47 -0700 Subject: [PATCH] --- yaml --- r: 249563 b: refs/heads/master c: 44939d37cc03af996d93b9d15385ac13de2bd627 h: refs/heads/master i: 249561: b4e8baf9b116674395e2dacb2540ee074c449a80 249559: 8d7e717ab3fa8e7e1f2f853ad3f3bb2ce189bb23 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c125cb2120dd..63e6c5a7f594 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b413bba38452b030d2192becb3865c7f914929d9 +refs/heads/master: 44939d37cc03af996d93b9d15385ac13de2bd627 diff --git a/trunk/drivers/staging/hv/hv.c b/trunk/drivers/staging/hv/hv.c index e0c2861979b8..2efac38dfd8c 100644 --- a/trunk/drivers/staging/hv/hv.c +++ b/trunk/drivers/staging/hv/hv.c @@ -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); */ @@ -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); @@ -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; @@ -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; @@ -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 *) @@ -224,7 +224,7 @@ int hv_init(void) return ret; -Cleanup: +cleanup: if (virtaddr) { if (hypercall_msr.enable) { hypercall_msr.as_uint64 = 0; @@ -345,7 +345,7 @@ 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] = @@ -353,7 +353,7 @@ void hv_synic_init(void *irqarg) 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 */ @@ -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]);