From: Jack Lange <jacklange@cs.pitt.edu>
Date: Fri, 18 Mar 2011 18:25:52 +0000 (-0400)
Subject: linux build fix and deinitialization fix
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=642821b60b7f80206b51a18542628438aa891c70;p=palacios.git

linux build fix and deinitialization fix
---

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 3ee850a..1498b73 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -4,6 +4,7 @@
 #include <linux/cdev.h>
 #include <linux/list.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include "palacios-console.h"
 
diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index bf338a1..ea24ca3 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -72,17 +72,17 @@ static void deinit_cpu(void * arg) {
 
 
     switch (v3_cpu_types[cpu_id]) {
- #ifdef CONFIG_SVM
-	case V3_VMX_CPU:
-	case V3_VMX_EPT_CPU:
-	    PrintDebug("Machine is SVM Capable\n");
+#ifdef CONFIG_SVM
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    PrintDebug("Deinitializing SVM CPU %d\n", cpu_id);
 	    v3_deinit_svm_cpu(cpu_id);
 	    break;
 #endif
 #ifdef CONFIG_VMX
-	case V3_SVM_CPU:
-	case V3_SVM_REV3_CPU:
-	    PrintDebug("Machine is VMX Capable\n");
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    PrintDebug("Deinitializing VMX CPU %d\n", cpu_id);
 	    v3_deinit_vmx_cpu(cpu_id);
 	    break;
 #endif