1 files changed, 8 insertions, 5 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 88cc3e043b0b..6c2c82565281 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -392,11 +392,14 @@ static struct page *walk_page_table(unsigned long addr)
 extern int isolate_lru_page(struct page *page);
 extern void putback_lru_page(struct page *page);
 
+extern struct page *new_alloc_page(struct page *page, unsigned long node, int **x);
+
+#if 0
 static struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
 {
         return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE, 0);
 }
-
+#endif
 asmlinkage long sys_set_page_color(int cpu)
 {
         long ret = 0;
@@ -423,8 +426,8 @@ asmlinkage long sys_set_page_color(int cpu)
                 */
                 num_pages = (vma_itr->vm_end - vma_itr->vm_start) / PAGE_SIZE;
                 // print vma flags
-                //printk(KERN_INFO "flags: 0x%lx\n", vma_itr->vm_flags);
-                //printk(KERN_INFO "start - end: 0x%lx - 0x%lx (%lu)\n", vma_itr->vm_start, vma_itr->vm_end, (vma_itr->vm_end - vma_itr->vm_start)/PAGE_SIZE);
+                printk(KERN_INFO "flags: 0x%lx\n", vma_itr->vm_flags);
+                printk(KERN_INFO "start - end: 0x%lx - 0x%lx (%lu)\n", vma_itr->vm_start, vma_itr->vm_end, (vma_itr->vm_end - vma_itr->vm_start)/PAGE_SIZE);
                 
                 for (i = 0; i < num_pages; i++) {
 /*
@@ -447,7 +450,7 @@ asmlinkage long sys_set_page_color(int cpu)
                         //if (pfn_valid(__page_to_pfn(old_page)))
                         if (!ret) {
                                 //printk(KERN_INFO "page_mapcount = %d\n", page_mapcount(old_page));
-                                printk(KERN_INFO "addr: %lu, pfn: %lu mapcount: %d\n", vma_itr->vm_start + PAGE_SIZE*i, __page_to_pfn(old_page), page_mapcount(old_page));
+                                printk(KERN_INFO "addr: %lu, pfn: %lu %08x mapcount: %d\n", vma_itr->vm_start + PAGE_SIZE*i, __page_to_pfn(old_page), page_to_phys(old_page), page_mapcount(old_page));
                                 list_add_tail(&old_page->lru, &pagelist);
                                 inc_zone_page_state(old_page, NR_ISOLATED_ANON + !PageSwapBacked(old_page));
                                 nr_pages++;
@@ -464,7 +467,7 @@ put_and_next:
 
         ret = 0;
         if (!list_empty(&pagelist)) {
-                ret = migrate_pages(&pagelist, new_alloc_page, 0, MIGRATE_ASYNC, MR_SYSCALL);
+                ret = migrate_pages(&pagelist, new_alloc_page, 4, MIGRATE_ASYNC, MR_SYSCALL);
                 if (ret) {
                         printk(KERN_INFO "%ld pages not migrated.\n", ret);
                         putback_lru_pages(&pagelist);