various linux fixes

diff --git a/linux_module/mm.c b/linux_module/mm.c
index a62b55a..04dcab3 100644 (file)
--- a/linux_module/mm.c
+++ b/linux_module/mm.c
@@ -65,7 +65,7 @@ static uintptr_t alloc_contig_pgs(u64 num_pages, u32 alignment) {
        start = ((alignment - (pool.base_addr % alignment)) >> 12);
     }
 
-    printk("\t Start idx %d (base_addr=%llu)\n", start, (u64)pool.base_addr);
+    printk("\t Start idx %d (base_addr=%p)\n", start, (void *)(u64)pool.base_addr);
 
     for (i = start; i < (pool.num_pages - num_pages); i += step) {
        if (get_page_bit(i) == 0) {

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 0310a40..05789fb 100644 (file)
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -91,6 +91,7 @@ palacios_alloc(unsigned int size) {
        addr = kmalloc(size, GFP_KERNEL);
     }
     mallocs++;
+
  
     return addr;
 }
@@ -472,7 +473,7 @@ int palacios_vmm_init( void )
     
     printk("palacios_init starting - calling init_v3\n");
     
-    Init_V3(&palacios_os_hooks, nr_cpu_ids);
+    Init_V3(&palacios_os_hooks, num_online_cpus());
 
     return 0;
 

diff --git a/linux_module/vm.c b/linux_module/vm.c
index 00111fc..890cb69 100644 (file)
--- a/linux_module/vm.c
+++ b/linux_module/vm.c
@@ -12,7 +12,7 @@
 #include <linux/poll.h>
 #include <linux/anon_inodes.h>
 #include <linux/sched.h>
-
+#include <linux/vmalloc.h>
 #include <linux/file.h>
 #include <linux/spinlock.h>
 #include <linux/rbtree.h>