aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2007-05-10 19:05:59 -0400
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2007-05-10 19:05:59 -0400
commit9c454bad00b82aff8a6cd1f5048c762ef1d4fe49 (patch)
treef99c318ae5d01554b968a8f54e952b33e63a43ec
parenta866494041074a7f53b425f7221a76778e277858 (diff)
Minor fixes.
-rw-r--r--kernel/sched_gsn_edf.c2
-rw-r--r--kernel/sched_part_edf.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c
index 963b739102..db854db448 100644
--- a/kernel/sched_gsn_edf.c
+++ b/kernel/sched_gsn_edf.c
@@ -338,8 +338,6 @@ static int gsnedf_schedule(struct task_struct * prev,
338 queue_lock(&gsnedf_lock); 338 queue_lock(&gsnedf_lock);
339 clear_will_schedule(); 339 clear_will_schedule();
340 340
341 BUG_ON(is_realtime(prev) && is_np(prev));
342
343 /* (1) check for blocking jobs */ 341 /* (1) check for blocking jobs */
344 if (prev == entry->linked && 342 if (prev == entry->linked &&
345 (get_rt_mode() != MODE_RT_RUN || !is_running(prev))) { 343 (get_rt_mode() != MODE_RT_RUN || !is_running(prev))) {
diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c
index cd4dd0e621..c382722a24 100644
--- a/kernel/sched_part_edf.c
+++ b/kernel/sched_part_edf.c
@@ -307,7 +307,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
307 * Plugin initialization code. 307 * Plugin initialization code.
308 */ 308 */
309#define INIT_SCHED_PLUGIN (struct sched_plugin) {\ 309#define INIT_SCHED_PLUGIN (struct sched_plugin) {\
310 .plugin_name = "Partioned EDF",\ 310 .plugin_name = "Partitioned EDF",\
311 .ready_to_use = 1,\ 311 .ready_to_use = 1,\
312 .algo_scheduler_tick = part_edf_scheduler_tick,\ 312 .algo_scheduler_tick = part_edf_scheduler_tick,\
313 .scheduler_tick = rt_scheduler_tick,\ 313 .scheduler_tick = rt_scheduler_tick,\