1 files changed, 9 insertions, 11 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index f8397898ce0a..1bbad8db1a55 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -393,7 +393,10 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
         void * ctrl_page_orig = NULL;
 #endif
 
-        void*  color_ctrl_page = NULL;
+        void *color_ctrl_page = NULL;
+#ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
+        void *color_ctrl_page_orig = NULL;
+#endif
 
         if (restore) {
                 /* Safe user-space provided configuration data.
@@ -403,6 +406,7 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
                 color_ctrl_page = p->rt_param.color_ctrl_page;
 #ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
                 ctrl_page_orig = p->rt_param.ctrl_page_orig;
+                color_ctrl_page_orig = p->rt_param.color_ctrl_page_orig;
 #endif
         }
 
@@ -421,6 +425,7 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
                 p->rt_param.color_ctrl_page     = color_ctrl_page;
 #ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
                 p->rt_param.ctrl_page_orig = ctrl_page_orig;
+                p->rt_param.color_ctrl_page_orig = color_ctrl_page_orig;
 #endif
         }
 }
@@ -573,6 +578,7 @@ void litmus_fork(struct task_struct* p)
                 tsk_rt(p)->color_ctrl_page = NULL;
 #ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
                 tsk_rt(p)->ctrl_page_orig = NULL;
+                tsk_rt(p)->color_ctrl_page_orig = NULL;
 #endif
         }
 
@@ -590,14 +596,12 @@ void litmus_exec(void)
 
         if (is_realtime(p)) {
                 WARN_ON(p->rt_param.inh_task);
-                if (tsk_rt(p)->color_ctrl_page) {
-                        free_page((unsigned long) tsk_rt(p)->color_ctrl_page);
-                        tsk_rt(p)->color_ctrl_page = NULL;
-                }
                 litmus_schedule_deallocation(p);
                 tsk_rt(p)->ctrl_page = NULL;
+                tsk_rt(p)->color_ctrl_page = NULL;
 #ifdef CONFIG_ARCH_NEEDS_UNCACHED_CONTROL_PAGE
                 tsk_rt(p)->ctrl_page_orig = NULL;
+                tsk_rt(p)->color_ctrl_page_orig = NULL;
 #endif
         }
 }
@@ -611,12 +615,6 @@ void exit_litmus(struct task_struct *dead_tsk)
          * So check if we need to free the page
          * in any case.
          */
-        if (tsk_rt(dead_tsk)->color_ctrl_page) {
-                TRACE_TASK(dead_tsk,
-                                "freeing color_ctrl_page %p\n",
-                                tsk_rt(dead_tsk)->color_ctrl_page);
-                free_page((unsigned long) tsk_rt(dead_tsk)->color_ctrl_page);
-        }
 
 #ifdef CONFIG_PLUGIN_MC
         /* The MC-setup syscall might succeed and allocate mc_data, but the