diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-09 07:42:37 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-09 07:42:37 -0400 |
commit | f19eb937742f98096bb4d1d72af15459547e7c49 (patch) | |
tree | 9f71941e2fa9f8f1db9cf2721e7a67f87bb38d86 /kernel | |
parent | d2033da1062f5bc28a4c88cd0cfc3b27e7f0f960 (diff) |
FIXME: hot fixes to get it to run
Take out signal delivery from scheduler, circular locking possible.
Remove duplicate, unprotected sched_trace_job_completion()
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/edf_common.c | 1 | ||||
-rw-r--r-- | kernel/litmus.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/edf_common.c b/kernel/edf_common.c index 1558ed2e8e..16b589d3e7 100644 --- a/kernel/edf_common.c +++ b/kernel/edf_common.c | |||
@@ -128,7 +128,6 @@ long edf_sleep_next_period(void) | |||
128 | /* call schedule, this will return when a new job arrives | 128 | /* call schedule, this will return when a new job arrives |
129 | * it also takes care of preparing for the next release | 129 | * it also takes care of preparing for the next release |
130 | */ | 130 | */ |
131 | sched_trace_job_completion(current); | ||
132 | schedule(); | 131 | schedule(); |
133 | return 0; | 132 | return 0; |
134 | } | 133 | } |
diff --git a/kernel/litmus.c b/kernel/litmus.c index 35160b7dd4..438b2e7942 100644 --- a/kernel/litmus.c +++ b/kernel/litmus.c | |||
@@ -533,7 +533,7 @@ void send_scheduler_signals(void) | |||
533 | struct list_head *p, *extra; | 533 | struct list_head *p, *extra; |
534 | struct siginfo info; | 534 | struct siginfo info; |
535 | struct task_struct* t; | 535 | struct task_struct* t; |
536 | 536 | /* | |
537 | if (spin_trylock_irqsave(&sched_sig_list_lock, flags)) { | 537 | if (spin_trylock_irqsave(&sched_sig_list_lock, flags)) { |
538 | 538 | ||
539 | list_for_each_safe(p, extra, &sched_sig_list) { | 539 | list_for_each_safe(p, extra, &sched_sig_list) { |
@@ -554,6 +554,7 @@ void send_scheduler_signals(void) | |||
554 | 554 | ||
555 | spin_unlock_irqrestore(&sched_sig_list_lock, flags); | 555 | spin_unlock_irqrestore(&sched_sig_list_lock, flags); |
556 | } | 556 | } |
557 | */ | ||
557 | } | 558 | } |
558 | 559 | ||
559 | static inline void np_mem_error(struct task_struct* t, const char* reason) | 560 | static inline void np_mem_error(struct task_struct* t, const char* reason) |