From 70fb1ddd71fc9a02e12221d4a0f29cca04feb672 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 2 Feb 2012 16:56:51 -0800 Subject: [PATCH] --- yaml --- r: 288868 b: refs/heads/master c: 14c1bf8a8920f36f6e0603a2ff920b48eec14387 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hv/hv.c | 4 ++-- trunk/drivers/hv/hyperv_vmbus.h | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 468ac1f1c8b3..8d6c0e1e4bfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2640335438ca4d7b139e114dae5f0d80e740e106 +refs/heads/master: 14c1bf8a8920f36f6e0603a2ff920b48eec14387 diff --git a/trunk/drivers/hv/hv.c b/trunk/drivers/hv/hv.c index 12aa97f31f93..15956bd48b48 100644 --- a/trunk/drivers/hv/hv.c +++ b/trunk/drivers/hv/hv.c @@ -155,9 +155,9 @@ int hv_init(void) union hv_x64_msr_hypercall_contents hypercall_msr; void *virtaddr = NULL; - memset(hv_context.synic_event_page, 0, sizeof(void *) * MAX_NUM_CPUS); + memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS); memset(hv_context.synic_message_page, 0, - sizeof(void *) * MAX_NUM_CPUS); + sizeof(void *) * NR_CPUS); if (!query_hypervisor_presence()) goto cleanup; diff --git a/trunk/drivers/hv/hyperv_vmbus.h b/trunk/drivers/hv/hyperv_vmbus.h index 6d7d286d5440..699f0d8e59ed 100644 --- a/trunk/drivers/hv/hyperv_vmbus.h +++ b/trunk/drivers/hv/hyperv_vmbus.h @@ -457,7 +457,6 @@ static const uuid_le VMBUS_SERVICE_ID = { }, }; -#define MAX_NUM_CPUS 32 struct hv_input_signal_event_buffer { @@ -483,8 +482,8 @@ struct hv_context { /* 8-bytes aligned of the buffer above */ struct hv_input_signal_event *signal_event_param; - void *synic_message_page[MAX_NUM_CPUS]; - void *synic_event_page[MAX_NUM_CPUS]; + void *synic_message_page[NR_CPUS]; + void *synic_event_page[NR_CPUS]; }; extern struct hv_context hv_context;