2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 12aa97f31f93..15956bd48b48 100644
--- a/drivers/hv/hv.c
+++ b/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/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 6d7d286d5440..699f0d8e59ed 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/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;