Merge pull request #94 from alexngmsft/master

Fix warnings on 32-bit
LIS · Mar 21, 2016 · 193c551 · 193c551
2 parents 86469ee + d0a313c
commit 193c551
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/hv-rhel6.x/hv/hv.c b/hv-rhel6.x/hv/hv.c
@@ -222,9 +222,11 @@ int hv_init(void)
 {
 	int max_leaf;
 	union hv_x64_msr_hypercall_contents hypercall_msr;
-	union hv_x64_msr_hypercall_contents tsc_msr;
 	void *virtaddr = NULL;
+#ifdef CONFIG_X86_64
+	union hv_x64_msr_hypercall_contents tsc_msr;
 	void *va_tsc = NULL;
+#endif
 
 	memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS);
 	memset(hv_context.synic_message_page, 0,

diff --git a/hv-rhel7.x/hv/hv.c b/hv-rhel7.x/hv/hv.c
@@ -206,9 +206,11 @@ int hv_init(void)
 {
 	int max_leaf;
 	union hv_x64_msr_hypercall_contents hypercall_msr;
-	union hv_x64_msr_hypercall_contents tsc_msr;
 	void *virtaddr = NULL;
+#ifdef CONFIG_X86_64	
+	union hv_x64_msr_hypercall_contents tsc_msr;
 	void *va_tsc = NULL;
+#endif
 
 	memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS);
 	memset(hv_context.synic_message_page, 0,