diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-12-01 04:31:11 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-12-01 04:31:27 -0500 |
commit | 95f567bb53b3592d722c340c56aaabd5fc78a135 (patch) | |
tree | c24b330884943861b2877f1c86ba460e0e351cee | |
parent | 07382e1846d14b3aba3f245bf66537e8e3e0275b (diff) |
LITMUS: remove trailing whitespace for release2008.2
-rw-r--r-- | litmus/ftdev.c | 2 | ||||
-rw-r--r-- | litmus/litmus.c | 2 | ||||
-rwxr-xr-x | litmus/sched_pfair.c | 6 | ||||
-rw-r--r-- | litmus/sched_task_trace.c | 2 | ||||
-rw-r--r-- | litmus/srp.c | 8 | ||||
-rw-r--r-- | litmus/sync.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/litmus/ftdev.c b/litmus/ftdev.c index a62ccecf64..7c933ffdaa 100644 --- a/litmus/ftdev.c +++ b/litmus/ftdev.c | |||
@@ -110,7 +110,7 @@ static int ftdev_open(struct inode *in, struct file *filp) | |||
110 | } | 110 | } |
111 | if (ftdev->can_open && (err = ftdev->can_open(ftdev, buf_idx))) | 111 | if (ftdev->can_open && (err = ftdev->can_open(ftdev, buf_idx))) |
112 | goto out; | 112 | goto out; |
113 | 113 | ||
114 | ftdm = ftdev->minor + buf_idx; | 114 | ftdm = ftdev->minor + buf_idx; |
115 | filp->private_data = ftdm; | 115 | filp->private_data = ftdm; |
116 | 116 | ||
diff --git a/litmus/litmus.c b/litmus/litmus.c index cd3c96a8f3..314bdda489 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -595,7 +595,7 @@ int switch_sched_plugin(struct sched_plugin* plugin) | |||
595 | goto out; | 595 | goto out; |
596 | ret = plugin->activate_plugin(); | 596 | ret = plugin->activate_plugin(); |
597 | if (0 != ret) { | 597 | if (0 != ret) { |
598 | printk(KERN_INFO "Can't activate %s (%d).\n", | 598 | printk(KERN_INFO "Can't activate %s (%d).\n", |
599 | plugin->plugin_name, ret); | 599 | plugin->plugin_name, ret); |
600 | plugin = &linux_sched_plugin; | 600 | plugin = &linux_sched_plugin; |
601 | } | 601 | } |
diff --git a/litmus/sched_pfair.c b/litmus/sched_pfair.c index d0c06e03a7..a733c95b9a 100755 --- a/litmus/sched_pfair.c +++ b/litmus/sched_pfair.c | |||
@@ -434,7 +434,7 @@ static void schedule_next_quantum(quanta_t time) | |||
434 | 434 | ||
435 | for (cpu = 0; cpu < NR_CPUS; cpu++) | 435 | for (cpu = 0; cpu < NR_CPUS; cpu++) |
436 | if (pstate[cpu]->linked) | 436 | if (pstate[cpu]->linked) |
437 | PTRACE_TASK(pstate[cpu]->linked, | 437 | PTRACE_TASK(pstate[cpu]->linked, |
438 | " linked on %d.\n", cpu); | 438 | " linked on %d.\n", cpu); |
439 | else | 439 | else |
440 | PTRACE("(null) linked on %d.\n", cpu); | 440 | PTRACE("(null) linked on %d.\n", cpu); |
@@ -511,7 +511,7 @@ static void pfair_tick(struct task_struct* t) | |||
511 | cur = current_quantum(state); | 511 | cur = current_quantum(state); |
512 | PTRACE("q %lu at %llu\n", cur, litmus_clock()); | 512 | PTRACE("q %lu at %llu\n", cur, litmus_clock()); |
513 | 513 | ||
514 | /* Attempt to advance time. First CPU to get here | 514 | /* Attempt to advance time. First CPU to get here |
515 | * will prepare the next quantum. | 515 | * will prepare the next quantum. |
516 | */ | 516 | */ |
517 | time = cmpxchg(&pfair_time, | 517 | time = cmpxchg(&pfair_time, |
@@ -551,7 +551,7 @@ static void pfair_tick(struct task_struct* t) | |||
551 | 551 | ||
552 | if (state->local != current | 552 | if (state->local != current |
553 | && (is_realtime(current) || is_present(state->local))) | 553 | && (is_realtime(current) || is_present(state->local))) |
554 | set_tsk_need_resched(current); | 554 | set_tsk_need_resched(current); |
555 | } | 555 | } |
556 | 556 | ||
557 | static int safe_to_schedule(struct task_struct* t, int cpu) | 557 | static int safe_to_schedule(struct task_struct* t, int cpu) |
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c index 4b546a86d6..913d999dfe 100644 --- a/litmus/sched_task_trace.c +++ b/litmus/sched_task_trace.c | |||
@@ -148,7 +148,7 @@ feather_callback void do_sched_trace_task_switch_away(unsigned long id, unsigned | |||
148 | } | 148 | } |
149 | } | 149 | } |
150 | 150 | ||
151 | feather_callback void do_sched_trace_task_completion(unsigned long id, unsigned long _task, | 151 | feather_callback void do_sched_trace_task_completion(unsigned long id, unsigned long _task, |
152 | unsigned long forced) | 152 | unsigned long forced) |
153 | { | 153 | { |
154 | struct task_struct *t = (struct task_struct*) _task; | 154 | struct task_struct *t = (struct task_struct*) _task; |
diff --git a/litmus/srp.c b/litmus/srp.c index 6e670f9138..71639b9916 100644 --- a/litmus/srp.c +++ b/litmus/srp.c | |||
@@ -78,7 +78,7 @@ struct srp_semaphore { | |||
78 | int cpu; /* cpu associated with this "semaphore" and resource */ | 78 | int cpu; /* cpu associated with this "semaphore" and resource */ |
79 | }; | 79 | }; |
80 | 80 | ||
81 | #define ceiling2sem(c) container_of(c, struct srp_semaphore, ceiling) | 81 | #define ceiling2sem(c) container_of(c, struct srp_semaphore, ceiling) |
82 | 82 | ||
83 | static int srp_exceeds_ceiling(struct task_struct* first, | 83 | static int srp_exceeds_ceiling(struct task_struct* first, |
84 | struct srp* srp) | 84 | struct srp* srp) |
@@ -86,7 +86,7 @@ static int srp_exceeds_ceiling(struct task_struct* first, | |||
86 | return list_empty(&srp->ceiling) || | 86 | return list_empty(&srp->ceiling) || |
87 | get_rt_period(first) < system_ceiling(srp)->period || | 87 | get_rt_period(first) < system_ceiling(srp)->period || |
88 | (get_rt_period(first) == system_ceiling(srp)->period && | 88 | (get_rt_period(first) == system_ceiling(srp)->period && |
89 | first->pid < system_ceiling(srp)->pid) || | 89 | first->pid < system_ceiling(srp)->pid) || |
90 | ceiling2sem(system_ceiling(srp))->owner == first; | 90 | ceiling2sem(system_ceiling(srp))->owner == first; |
91 | } | 91 | } |
92 | 92 | ||
@@ -176,7 +176,7 @@ static void do_srp_down(struct srp_semaphore* sem) | |||
176 | } | 176 | } |
177 | 177 | ||
178 | static void do_srp_up(struct srp_semaphore* sem) | 178 | static void do_srp_up(struct srp_semaphore* sem) |
179 | { | 179 | { |
180 | /* Determine new system priority ceiling for this CPU. */ | 180 | /* Determine new system priority ceiling for this CPU. */ |
181 | WARN_ON(!in_list(&sem->ceiling.list)); | 181 | WARN_ON(!in_list(&sem->ceiling.list)); |
182 | if (in_list(&sem->ceiling.list)) | 182 | if (in_list(&sem->ceiling.list)) |
@@ -296,7 +296,7 @@ void srp_ceiling_block(void) | |||
296 | do_ceiling_block(tsk); | 296 | do_ceiling_block(tsk); |
297 | TRACE_CUR("finally exceeds system ceiling.\n"); | 297 | TRACE_CUR("finally exceeds system ceiling.\n"); |
298 | } else | 298 | } else |
299 | TRACE_CUR("is not priority ceiling blocked\n"); | 299 | TRACE_CUR("is not priority ceiling blocked\n"); |
300 | preempt_enable(); | 300 | preempt_enable(); |
301 | } | 301 | } |
302 | 302 | ||
diff --git a/litmus/sync.c b/litmus/sync.c index 8b0ebea49a..d5069f9899 100644 --- a/litmus/sync.c +++ b/litmus/sync.c | |||
@@ -44,7 +44,7 @@ static long do_release_ts(lt_t start) | |||
44 | 44 | ||
45 | spin_lock_irqsave(&ts_release.wait.lock, flags); | 45 | spin_lock_irqsave(&ts_release.wait.lock, flags); |
46 | TRACE("<<<<<< synchronous task system release >>>>>>\n"); | 46 | TRACE("<<<<<< synchronous task system release >>>>>>\n"); |
47 | 47 | ||
48 | sched_trace_sys_release(&start); | 48 | sched_trace_sys_release(&start); |
49 | list_for_each(pos, &ts_release.wait.task_list) { | 49 | list_for_each(pos, &ts_release.wait.task_list) { |
50 | t = (struct task_struct*) list_entry(pos, | 50 | t = (struct task_struct*) list_entry(pos, |