2 files changed, 0 insertions, 101 deletions

diff --git a/litmus/ctrldev.c b/litmus/ctrldev.c
index 1d19e208ecd4..65d36b92d952 100644
--- a/litmus/ctrldev.c
+++ b/litmus/ctrldev.c
@@ -19,20 +19,12 @@ static struct workqueue_struct *wq_litmus_dealloc;
 struct litmus_dealloc_work {
         struct work_struct work_struct;
         void *ctrl_page_mem;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        void *ctrl_page_unmap;
-#endif
 };
 
 static void litmus_dealloc(struct work_struct *work_in)
 {
         struct litmus_dealloc_work *work = container_of(work_in,
                         struct litmus_dealloc_work, work_struct);
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        TRACE("vunmap() control page %p.\n", work->ctrl_page_unmap);
-        vunmap(work->ctrl_page_unmap);
-
-#endif
         TRACE("freeing ctrl_page %p\n", work->ctrl_page_mem);
         free_page((unsigned long) work->ctrl_page_mem);
 
@@ -54,70 +46,14 @@ void litmus_schedule_deallocation(struct task_struct *t)
 
         INIT_WORK(&work->work_struct, litmus_dealloc);
 
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        work->ctrl_page_mem = tsk_rt(t)->ctrl_page_orig;
-        work->ctrl_page_unmap = tsk_rt(t)->ctrl_page;
-#else
         work->ctrl_page_mem = tsk_rt(t)->ctrl_page;
-#endif
         queue_work(wq_litmus_dealloc, &work->work_struct);
 }
 
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-/*
- * remap_noncached - creates a non-cached memory "shadow mapping"
- * @addr:       memory base virtual address
- * @len:        length to remap
- *
- * The caller should vunmap(addr) when the mapping is no longer needed.
- * The caller should also save the original @addr to free it later.
- */
-void * remap_noncached(void *addr, size_t len)
-{
-        void *vaddr;
-        int nr_pages = DIV_ROUND_UP(offset_in_page(addr) + len, PAGE_SIZE);
-        struct page **pages = kmalloc(nr_pages * sizeof(*pages), GFP_KERNEL);
-        void *page_addr = (void *)((unsigned long)addr & PAGE_MASK);
-        int i;
-
-        if (NULL == pages) {
-                TRACE_CUR("No memory!\n");
-                return ERR_PTR(-ENOMEM);
-        }
-
-        for (i = 0; i < nr_pages; i++) {
-                if (is_vmalloc_or_module_addr(page_addr)) {
-                        kfree(pages);
-                        TRACE_CUR("Remapping vmalloc or module memory?\n");
-                        return ERR_PTR(-EINVAL);
-                }
-
-                pages[i] = virt_to_page(page_addr);
-                if (NULL == pages[i]) {
-                        kfree(pages);
-                        TRACE_CUR("Bad virtual address.\n");
-                        return ERR_PTR(-EINVAL);
-                }
-                page_addr += PAGE_SIZE;
-        }
-
-        vaddr = vmap(pages, nr_pages, VM_MAP, pgprot_noncached(PAGE_KERNEL));
-        kfree(pages);
-        if (NULL == vaddr) {
-                TRACE_CUR("vmap() failed.\n");
-                return ERR_PTR(-ENOMEM);
-        }
-        return vaddr + offset_in_page(addr);
-}
-#endif
-
 /* allocate t->rt_param.ctrl_page*/
 static int alloc_ctrl_page(struct task_struct *t)
 {
         void *mem;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        void *mem_remap;
-#endif
         int err = 0;
 
         /* only allocate if the task doesn't have one yet */
@@ -128,20 +64,7 @@ static int alloc_ctrl_page(struct task_struct *t)
                         goto out;
                 }
 
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-                mem_remap = remap_noncached(mem, PAGE_SIZE);
-                if (IS_ERR(mem_remap)) {
-                        err = PTR_ERR(mem_remap);
-                        free_page((unsigned long) mem);
-                        goto out;
-                }
-                tsk_rt(t)->ctrl_page_orig = mem;
-                tsk_rt(t)->ctrl_page = mem_remap;
-                TRACE_TASK(t, "ctrl_page_orig = %p\n",
-                                tsk_rt(t)->ctrl_page_orig);
-#else
                 tsk_rt(t)->ctrl_page = mem;
-#endif
 
                 /* will get de-allocated in task teardown */
                 TRACE_TASK(t, "%s ctrl_page = %p\n", __FUNCTION__,
@@ -156,12 +79,7 @@ static int map_ctrl_page(struct task_struct *t, struct vm_area_struct* vma)
         struct page *ctrl;
         int err;
 
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        /* vm_insert_page() using the "real" vaddr, not the shadow mapping. */
-        ctrl = virt_to_page(tsk_rt(t)->ctrl_page_orig);
-#else
         ctrl = virt_to_page(tsk_rt(t)->ctrl_page);
-#endif
 
         TRACE_CUR(CTRL_NAME
                   ": mapping %p (pfn:%lx) to 0x%lx (prot:%lx)\n",
@@ -234,11 +152,7 @@ static int litmus_ctrl_mmap(struct file* filp, struct vm_area_struct* vma)
          * don't care if it was touched or not. __S011 means RW access, but not
          * execute, and avoids copy-on-write behavior.
          * See protection_map in mmap.c.  */
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        vma->vm_page_prot = pgprot_noncached(__S011);
-#else
         vma->vm_page_prot = __S011;
-#endif
 
         err = alloc_ctrl_page(current);
         if (!err)
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 23c09a2e58b0..3de9252b3223 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -391,9 +391,6 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
         struct rt_task  user_config = {};
         void*  ctrl_page     = NULL;
         struct list_head color_page_info_list;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-        void * ctrl_page_orig = NULL;
-#endif
 
         TRACE_CUR("restore: %d\n", restore);
 
@@ -402,9 +399,6 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
                  * and allocated page. */
                 user_config     = p->rt_param.task_params;
                 ctrl_page       = p->rt_param.ctrl_page;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-                ctrl_page_orig = p->rt_param.ctrl_page_orig;
-#endif
                 color_page_info_list.next =
                         p->rt_param.color_page_info_list.next;
                 color_page_info_list.prev =
@@ -424,9 +418,6 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
         if (restore) {
                 p->rt_param.task_params         = user_config;
                 p->rt_param.ctrl_page           = ctrl_page;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-                p->rt_param.ctrl_page_orig = ctrl_page_orig;
-#endif
                 p->rt_param.color_page_info_list.next =
                         color_page_info_list.next;
                 p->rt_param.color_page_info_list.prev =
@@ -579,9 +570,6 @@ void litmus_fork(struct task_struct* p)
         } else {
                 /* non-rt tasks might have ctrl_page set */
                 tsk_rt(p)->ctrl_page = NULL;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-                tsk_rt(p)->ctrl_page_orig = NULL;
-#endif
         }
 
         /* od tables are never inherited across a fork */
@@ -600,9 +588,6 @@ void litmus_exec(void)
                 WARN_ON(p->rt_param.inh_task);
                 litmus_schedule_deallocation(p);
                 tsk_rt(p)->ctrl_page = NULL;
-#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
-                tsk_rt(p)->ctrl_page_orig = NULL;
-#endif
         }
 }