diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-04 15:44:49 -0400 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-04 15:44:49 -0400 |
| commit | 11f62e3feaf3282d1983d0a40019a0d5e9222141 (patch) | |
| tree | ca6fa2bdc923b4ee645922cfc0d75524d0ec2a56 /kernel | |
| parent | 4be7a143bd5a08e8b8cee8539dea745a6107cfd3 (diff) | |
Remove some really old left-overs.
This is a long-overdue cleanup.`
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/litmus.c | 7 | ||||
| -rw-r--r-- | kernel/sched_adaptive.c | 1 | ||||
| -rw-r--r-- | kernel/sched_edf_hsb.c | 1 | ||||
| -rw-r--r-- | kernel/sched_global_edf.c | 2 | ||||
| -rw-r--r-- | kernel/sched_gsn_edf.c | 1 | ||||
| -rw-r--r-- | kernel/sched_part_edf.c | 1 | ||||
| -rw-r--r-- | kernel/sched_pfair.c | 1 | ||||
| -rw-r--r-- | kernel/sched_psn_edf.c | 1 |
8 files changed, 0 insertions, 15 deletions
diff --git a/kernel/litmus.c b/kernel/litmus.c index 217b0a0357..770f67af8f 100644 --- a/kernel/litmus.c +++ b/kernel/litmus.c | |||
| @@ -301,13 +301,6 @@ asmlinkage long sys_query_job_no(unsigned int __user *job) | |||
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | 303 | ||
| 304 | |||
| 305 | /* Set scheduling options for all cpus. */ | ||
| 306 | void set_sched_options(int options) | ||
| 307 | { | ||
| 308 | sched_options = options; | ||
| 309 | } | ||
| 310 | |||
| 311 | /* The LITMUS tick function. It manages the change to and from real-time mode | 304 | /* The LITMUS tick function. It manages the change to and from real-time mode |
| 312 | * and then calls the plugin's tick function. | 305 | * and then calls the plugin's tick function. |
| 313 | */ | 306 | */ |
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c index 14a8db7638..1942422452 100644 --- a/kernel/sched_adaptive.c +++ b/kernel/sched_adaptive.c | |||
| @@ -802,7 +802,6 @@ sched_plugin_t *__init init_adaptive_plugin(void) | |||
| 802 | } | 802 | } |
| 803 | 803 | ||
| 804 | queue_lock_init(&adaptive_lock); | 804 | queue_lock_init(&adaptive_lock); |
| 805 | set_sched_options(SCHED_NONE); | ||
| 806 | edf_domain_init(&adaptive, NULL); | 805 | edf_domain_init(&adaptive, NULL); |
| 807 | s_plugin = INIT_SCHED_PLUGIN; | 806 | s_plugin = INIT_SCHED_PLUGIN; |
| 808 | } | 807 | } |
diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c index 07820054b7..b53a277658 100644 --- a/kernel/sched_edf_hsb.c +++ b/kernel/sched_edf_hsb.c | |||
| @@ -1787,7 +1787,6 @@ sched_plugin_t *__init init_edf_hsb_plugin(void) | |||
| 1787 | 1787 | ||
| 1788 | if (!s_plugin.ready_to_use) | 1788 | if (!s_plugin.ready_to_use) |
| 1789 | { | 1789 | { |
| 1790 | set_sched_options(SCHED_NONE); | ||
| 1791 | capacity_queue_init(&cap_queue); | 1790 | capacity_queue_init(&cap_queue); |
| 1792 | edf_domain_init(&srt, srt_check_resched); | 1791 | edf_domain_init(&srt, srt_check_resched); |
| 1793 | edf_domain_init(&be, be_check_resched); | 1792 | edf_domain_init(&be, be_check_resched); |
diff --git a/kernel/sched_global_edf.c b/kernel/sched_global_edf.c index 3ca46c1fb9..b00674a5c4 100644 --- a/kernel/sched_global_edf.c +++ b/kernel/sched_global_edf.c | |||
| @@ -447,7 +447,6 @@ sched_plugin_t *__init init_global_edf_plugin(void) | |||
| 447 | { | 447 | { |
| 448 | if (!s_plugin.ready_to_use) | 448 | if (!s_plugin.ready_to_use) |
| 449 | { | 449 | { |
| 450 | set_sched_options(SCHED_NONE); | ||
| 451 | edf_domain_init(&gedf, gedf_check_resched); | 450 | edf_domain_init(&gedf, gedf_check_resched); |
| 452 | s_plugin = INIT_SCHED_PLUGIN; | 451 | s_plugin = INIT_SCHED_PLUGIN; |
| 453 | } | 452 | } |
| @@ -558,7 +557,6 @@ sched_plugin_t* __init init_global_edf_np_plugin(void) | |||
| 558 | { | 557 | { |
| 559 | if (!s_plugin.ready_to_use) | 558 | if (!s_plugin.ready_to_use) |
| 560 | { | 559 | { |
| 561 | set_sched_options(SCHED_NONE); | ||
| 562 | edf_domain_init(&gedf, gedf_np_check_resched); | 560 | edf_domain_init(&gedf, gedf_np_check_resched); |
| 563 | s_plugin = INIT_SCHED_PLUGIN_NP; | 561 | s_plugin = INIT_SCHED_PLUGIN_NP; |
| 564 | } | 562 | } |
diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c index 5ff2670727..2dae550f29 100644 --- a/kernel/sched_gsn_edf.c +++ b/kernel/sched_gsn_edf.c | |||
| @@ -806,7 +806,6 @@ sched_plugin_t *__init init_gsn_edf_plugin(void) | |||
| 806 | } | 806 | } |
| 807 | 807 | ||
| 808 | queue_lock_init(&gsnedf_lock); | 808 | queue_lock_init(&gsnedf_lock); |
| 809 | set_sched_options(SCHED_NONE); | ||
| 810 | edf_domain_init(&gsnedf, NULL); | 809 | edf_domain_init(&gsnedf, NULL); |
| 811 | s_plugin = INIT_SCHED_PLUGIN; | 810 | s_plugin = INIT_SCHED_PLUGIN; |
| 812 | } | 811 | } |
diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c index dee761525c..57e22d3d68 100644 --- a/kernel/sched_part_edf.c +++ b/kernel/sched_part_edf.c | |||
| @@ -329,7 +329,6 @@ sched_plugin_t *__init init_part_edf_plugin(void) | |||
| 329 | 329 | ||
| 330 | if (!s_plugin.ready_to_use) | 330 | if (!s_plugin.ready_to_use) |
| 331 | { | 331 | { |
| 332 | set_sched_options(SCHED_NONE); | ||
| 333 | for (i = 0; i < NR_CPUS; i++) | 332 | for (i = 0; i < NR_CPUS; i++) |
| 334 | { | 333 | { |
| 335 | part_edf_domain_init(remote_pedf(i), | 334 | part_edf_domain_init(remote_pedf(i), |
diff --git a/kernel/sched_pfair.c b/kernel/sched_pfair.c index 4fa6ba2a8f..c0c6614eb7 100644 --- a/kernel/sched_pfair.c +++ b/kernel/sched_pfair.c | |||
| @@ -495,7 +495,6 @@ sched_plugin_t* __init init_pfair_plugin(void) | |||
| 495 | { | 495 | { |
| 496 | int i=0; | 496 | int i=0; |
| 497 | if (!s_plugin.ready_to_use) { | 497 | if (!s_plugin.ready_to_use) { |
| 498 | set_sched_options(SCHED_NONE); | ||
| 499 | pfair_domain_init(&pfair); | 498 | pfair_domain_init(&pfair); |
| 500 | for (i=0; i<NR_CPUS; i++) { | 499 | for (i=0; i<NR_CPUS; i++) { |
| 501 | sync_go[i] = 0; | 500 | sync_go[i] = 0; |
diff --git a/kernel/sched_psn_edf.c b/kernel/sched_psn_edf.c index 174cfea02c..2f683aa683 100644 --- a/kernel/sched_psn_edf.c +++ b/kernel/sched_psn_edf.c | |||
| @@ -538,7 +538,6 @@ sched_plugin_t *__init init_psn_edf_plugin(void) | |||
| 538 | 538 | ||
| 539 | if (!s_plugin.ready_to_use) | 539 | if (!s_plugin.ready_to_use) |
| 540 | { | 540 | { |
| 541 | set_sched_options(SCHED_NONE); | ||
| 542 | for (i = 0; i < NR_CPUS; i++) | 541 | for (i = 0; i < NR_CPUS; i++) |
| 543 | { | 542 | { |
| 544 | psnedf_domain_init(remote_pedf(i), | 543 | psnedf_domain_init(remote_pedf(i), |
