From 9a2ea08607025d72fad2e0fd7b65411d1d63706c Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:46 -0700 Subject: [PATCH] --- yaml --- r: 249562 b: refs/heads/master c: b413bba38452b030d2192becb3865c7f914929d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv.c | 31 ------------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/[refs] b/[refs] index 7914d8256641..c125cb2120dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d81d33059e3a062660fd671ea8842662373dfb9 +refs/heads/master: b413bba38452b030d2192becb3865c7f914929d9 diff --git a/trunk/drivers/staging/hv/hv.c b/trunk/drivers/staging/hv/hv.c index e6312bd47d7e..e0c2861979b8 100644 --- a/trunk/drivers/staging/hv/hv.c +++ b/trunk/drivers/staging/hv/hv.c @@ -82,34 +82,7 @@ static int query_hypervisor_info(void) op = HVCPUID_VENDOR_MAXFUNCTION; cpuid(op, &eax, &ebx, &ecx, &edx); -/* DPRINT_INFO(VMBUS, "Vendor ID: %c%c%c%c%c%c%c%c%c%c%c%c", - (ebx & 0xFF), - ((ebx >> 8) & 0xFF), - ((ebx >> 16) & 0xFF), - ((ebx >> 24) & 0xFF), - (ecx & 0xFF), - ((ecx >> 8) & 0xFF), - ((ecx >> 16) & 0xFF), - ((ecx >> 24) & 0xFF), - (edx & 0xFF), - ((edx >> 8) & 0xFF), - ((edx >> 16) & 0xFF), - ((edx >> 24) & 0xFF)); -*/ max_leaf = eax; -/* eax = 0; - ebx = 0; - ecx = 0; - edx = 0; - op = HVCPUID_INTERFACE; - cpuid(op, &eax, &ebx, &ecx, &edx); - - DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c", - (eax & 0xFF), - ((eax >> 8) & 0xFF), - ((eax >> 16) & 0xFF), - ((eax >> 24) & 0xFF)); -*/ if (max_leaf >= HVCPUID_VERSION) { eax = 0; @@ -399,10 +372,6 @@ void hv_synic_init(void *irqarg) wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64); - /* Setup the interception SINT. */ - /* wrmsrl((HV_X64_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX), */ - /* interceptionSint.as_uint64); */ - /* Setup the shared SINT. */ rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);