diff options
Diffstat (limited to 'litmus/litmus.c')
-rw-r--r-- | litmus/litmus.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c index e2bf2a7ad01b..d368202ab8c3 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <litmus/nvidia_info.h> | 25 | #include <litmus/nvidia_info.h> |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | #ifdef CONFIG_LITMUS_LOCKING | 28 | #ifdef CONFIG_REALTIME_AUX_TASKS |
29 | #include <litmus/aux_tasks.h> | 29 | #include <litmus/aux_tasks.h> |
30 | #endif | 30 | #endif |
31 | 31 | ||
@@ -413,7 +413,7 @@ static void reinit_litmus_state(struct task_struct* p, int restore) | |||
413 | /* Cleanup everything else. */ | 413 | /* Cleanup everything else. */ |
414 | memset(&p->rt_param, 0, sizeof(p->rt_param)); | 414 | memset(&p->rt_param, 0, sizeof(p->rt_param)); |
415 | 415 | ||
416 | #ifdef CONFIG_LITMUS_LOCKING | 416 | #ifdef CONFIG_REALTIME_AUX_TASKS |
417 | /* also clear out the aux_data. the !restore case is only called on | 417 | /* also clear out the aux_data. the !restore case is only called on |
418 | * fork (initial thread creation). */ | 418 | * fork (initial thread creation). */ |
419 | if (!restore) | 419 | if (!restore) |
@@ -623,10 +623,6 @@ void litmus_fork(struct task_struct* p) | |||
623 | tsk_rt(p)->ctrl_page = NULL; | 623 | tsk_rt(p)->ctrl_page = NULL; |
624 | 624 | ||
625 | reinit_litmus_state(p, 0); | 625 | reinit_litmus_state(p, 0); |
626 | |||
627 | /* still don't inherit any parental parameters */ | ||
628 | //memset(&p->rt_param, 0, sizeof(p->rt_param)); | ||
629 | //memset(&p->aux_data, 0, sizeof(p->aux_data)); | ||
630 | } | 626 | } |
631 | 627 | ||
632 | /* od tables are never inherited across a fork */ | 628 | /* od tables are never inherited across a fork */ |