bitkeeper revision 1.20 (3e36c6bbUkBKPUFHEdbVYjpf-mrJ-w)

2 files changed, 10 insertions, 0 deletions

diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c
index fa3008dd9a..d9c33da283 100644
--- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@ -40,6 +40,8 @@
 #define DOM_DIR         "dom"
 #define DOM_MEM         "mem"
 
+frame_table_t * frame_table;
+
 static struct proc_dir_entry *xeno_base;
 static struct proc_dir_entry *dom0_cmd_intf;
 static struct proc_dir_entry *proc_ft;
@@ -102,7 +104,11 @@ static ssize_t dom_mem_read(struct file * file, char * buff, size_t size, loff_t
 
     /* remap the range using xen specific routines */
 
+    printk(KERN_ALERT "bd240 debug: dmw entered %lx, %lx\n", mem_data->pfn, mem_data->tot_pages);
+
     addr = direct_mmap(mem_data->pfn << PAGE_SHIFT, mem_data->tot_pages << PAGE_SHIFT, prot, 0, 0);
+    
+    printk(KERN_ALERT "bd240 debug: dmw exit %lx, %lx\n", mem_data->pfn, mem_data->tot_pages);
 
     copy_to_user((unsigned long *)buff, &addr, sizeof(addr));
 
@@ -236,6 +242,8 @@ out:
 
 static int __init init_module(void)
 {
+    frame_table = (frame_table_t *)start_info.frame_table;
+    
     /* xeno proc root setup */
     xeno_base = proc_mkdir(XENO_BASE, &proc_root); 
 
diff --git a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c
index 1f62cbda7c..46b44deef3 100644
--- a/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c
+++ b/xenolinux-2.4.16-sparse/arch/xeno/drivers/dom0/dom0_memory.c
@@ -187,8 +187,10 @@ unsigned long direct_mmap(unsigned long phys_addr, unsigned long size,
 
     /* and perform the mapping */
     if(flag == MAP_DISCONT){
+        printk(KERN_ALERT "bd240 debug: call direct_remap_disc_page_range\n");
         ret = direct_remap_disc_page_range(addr, phys_addr, tot_pages, prot);
     } else {
+        printk(KERN_ALERT "bd240 debug: call direct_remap_page_range\n");
         ret = direct_remap_page_range(addr, phys_addr, size, prot);
     }