diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-09-10 07:05:30 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-09-10 07:05:30 -0400 |
commit | 1e693ff3453ec9e1c9b5cda9972215ff6f48a151 (patch) | |
tree | 8cd8f36771eb600fe509342fc9a6bce92e23794d | |
parent | 474407b2855672396e4e778d23274c347012a460 (diff) |
cleanup trailing whitespace
-rw-r--r-- | litmus/Kconfig | 4 | ||||
-rw-r--r-- | litmus/cheap.c | 14 | ||||
-rw-r--r-- | litmus/fdso.c | 2 | ||||
-rw-r--r-- | litmus/litmus.c | 8 | ||||
-rw-r--r-- | litmus/norqlock.c | 2 | ||||
-rw-r--r-- | litmus/rt_domain.c | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/litmus/Kconfig b/litmus/Kconfig index c2a7756b4f..f73a454c4f 100644 --- a/litmus/Kconfig +++ b/litmus/Kconfig | |||
@@ -19,7 +19,7 @@ config SRP | |||
19 | bool "Stack Resource Policy (SRP)" | 19 | bool "Stack Resource Policy (SRP)" |
20 | default n | 20 | default n |
21 | help | 21 | help |
22 | Include support for Baker's Stack Resource Policy. | 22 | Include support for Baker's Stack Resource Policy. |
23 | 23 | ||
24 | Say Yes if you want FMLP local long critical section synchronization support. | 24 | Say Yes if you want FMLP local long critical section synchronization support. |
25 | 25 | ||
@@ -43,7 +43,7 @@ config FEATHER_TRACE | |||
43 | help | 43 | help |
44 | Feather-Trace basic tracing infrastructure. Includes device file | 44 | Feather-Trace basic tracing infrastructure. Includes device file |
45 | driver and instrumentation point support. | 45 | driver and instrumentation point support. |
46 | 46 | ||
47 | 47 | ||
48 | config SCHED_TASK_TRACE | 48 | config SCHED_TASK_TRACE |
49 | bool "Trace real-time tasks" | 49 | bool "Trace real-time tasks" |
diff --git a/litmus/cheap.c b/litmus/cheap.c index 9fc68fd053..fde5304f8c 100644 --- a/litmus/cheap.c +++ b/litmus/cheap.c | |||
@@ -61,7 +61,7 @@ int cheap_insert(cheap_prio_t higher_prio, | |||
61 | int stop = 0; | 61 | int stop = 0; |
62 | unsigned int child, parent, locked; | 62 | unsigned int child, parent, locked; |
63 | unsigned int wait_for_parent_state; | 63 | unsigned int wait_for_parent_state; |
64 | 64 | ||
65 | lockdep_off(); /* generates false positives */ | 65 | lockdep_off(); /* generates false positives */ |
66 | 66 | ||
67 | spin_lock(&ch->lock); | 67 | spin_lock(&ch->lock); |
@@ -77,8 +77,8 @@ int cheap_insert(cheap_prio_t higher_prio, | |||
77 | spin_unlock(&ch->lock); | 77 | spin_unlock(&ch->lock); |
78 | lockdep_on(); | 78 | lockdep_on(); |
79 | return -1; | 79 | return -1; |
80 | } | 80 | } |
81 | 81 | ||
82 | spin_unlock(&ch->heap[child].lock); | 82 | spin_unlock(&ch->heap[child].lock); |
83 | 83 | ||
84 | /* bubble up */ | 84 | /* bubble up */ |
@@ -115,7 +115,7 @@ int cheap_insert(cheap_prio_t higher_prio, | |||
115 | } else { | 115 | } else { |
116 | /* Some other process needs to act first. | 116 | /* Some other process needs to act first. |
117 | * We need to back off a little in order | 117 | * We need to back off a little in order |
118 | * to give the others a chance to acquire the | 118 | * to give the others a chance to acquire the |
119 | * parent's lock. | 119 | * parent's lock. |
120 | */ | 120 | */ |
121 | wait_for_parent_state = ch->heap[parent].tag; | 121 | wait_for_parent_state = ch->heap[parent].tag; |
@@ -123,7 +123,7 @@ int cheap_insert(cheap_prio_t higher_prio, | |||
123 | 123 | ||
124 | spin_unlock(&ch->heap[locked].lock); | 124 | spin_unlock(&ch->heap[locked].lock); |
125 | spin_unlock(&ch->heap[parent].lock); | 125 | spin_unlock(&ch->heap[parent].lock); |
126 | 126 | ||
127 | while (wait_for_parent_state != CHEAP_EMPTY && | 127 | while (wait_for_parent_state != CHEAP_EMPTY && |
128 | ((volatile unsigned int) ch->heap[parent].tag) == | 128 | ((volatile unsigned int) ch->heap[parent].tag) == |
129 | wait_for_parent_state) | 129 | wait_for_parent_state) |
@@ -184,7 +184,7 @@ void* cheap_take_if(cheap_take_predicate_t pred, | |||
184 | 184 | ||
185 | /* unlock before locking root to maintain locking order */ | 185 | /* unlock before locking root to maintain locking order */ |
186 | spin_unlock(&ch->heap[child].lock); | 186 | spin_unlock(&ch->heap[child].lock); |
187 | 187 | ||
188 | spin_lock(&ch->heap[CHEAP_ROOT].lock); | 188 | spin_lock(&ch->heap[CHEAP_ROOT].lock); |
189 | if (ch->heap[CHEAP_ROOT].tag == CHEAP_EMPTY) { | 189 | if (ch->heap[CHEAP_ROOT].tag == CHEAP_EMPTY) { |
190 | /* heap became empty, we got the last one */ | 190 | /* heap became empty, we got the last one */ |
@@ -192,7 +192,7 @@ void* cheap_take_if(cheap_take_predicate_t pred, | |||
192 | lockdep_on(); | 192 | lockdep_on(); |
193 | return cval; | 193 | return cval; |
194 | } else { | 194 | } else { |
195 | /* grab value of root (=min), replace with | 195 | /* grab value of root (=min), replace with |
196 | * what we got from the last leaf | 196 | * what we got from the last leaf |
197 | */ | 197 | */ |
198 | val = ch->heap[CHEAP_ROOT].value; | 198 | val = ch->heap[CHEAP_ROOT].value; |
diff --git a/litmus/fdso.c b/litmus/fdso.c index bdc0466f9e..7a16f64071 100644 --- a/litmus/fdso.c +++ b/litmus/fdso.c | |||
@@ -134,7 +134,7 @@ static struct od_table_entry* get_od_entry(struct task_struct* t) | |||
134 | 134 | ||
135 | table = t->od_table; | 135 | table = t->od_table; |
136 | if (!table) { | 136 | if (!table) { |
137 | table = kzalloc(sizeof(*table) * MAX_OBJECT_DESCRIPTORS, | 137 | table = kzalloc(sizeof(*table) * MAX_OBJECT_DESCRIPTORS, |
138 | GFP_KERNEL); | 138 | GFP_KERNEL); |
139 | t->od_table = table; | 139 | t->od_table = table; |
140 | } | 140 | } |
diff --git a/litmus/litmus.c b/litmus/litmus.c index b286f8f013..3562322827 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -490,11 +490,11 @@ asmlinkage long sys_exit_np(void) | |||
490 | 490 | ||
491 | /* sys_null_call() is only used for determining raw system call | 491 | /* sys_null_call() is only used for determining raw system call |
492 | * overheads (kernel entry, kernel exit). It has no useful side effects. | 492 | * overheads (kernel entry, kernel exit). It has no useful side effects. |
493 | * If ts is non-NULL, then the current Feather-Trace time is recorded. | 493 | * If ts is non-NULL, then the current Feather-Trace time is recorded. |
494 | */ | 494 | */ |
495 | asmlinkage long sys_null_call(cycles_t __user *ts) | 495 | asmlinkage long sys_null_call(cycles_t __user *ts) |
496 | { | 496 | { |
497 | long ret = 0; | 497 | long ret = 0; |
498 | cycles_t now; | 498 | cycles_t now; |
499 | 499 | ||
500 | if (ts) { | 500 | if (ts) { |
@@ -789,7 +789,7 @@ static int proc_write_release_master(struct file *file, | |||
789 | 789 | ||
790 | if (count > 63) | 790 | if (count > 63) |
791 | return -EINVAL; | 791 | return -EINVAL; |
792 | 792 | ||
793 | if (copy_from_user(msg, buffer, count)) | 793 | if (copy_from_user(msg, buffer, count)) |
794 | return -EFAULT; | 794 | return -EFAULT; |
795 | 795 | ||
@@ -799,7 +799,7 @@ static int proc_write_release_master(struct file *file, | |||
799 | if (count > 1 && msg[count - 1] == '\n') | 799 | if (count > 1 && msg[count - 1] == '\n') |
800 | msg[count - 1] = '\0'; | 800 | msg[count - 1] = '\0'; |
801 | 801 | ||
802 | if (strcmp(msg, "NO_CPU") == 0) { | 802 | if (strcmp(msg, "NO_CPU") == 0) { |
803 | atomic_set(&release_master_cpu, NO_CPU); | 803 | atomic_set(&release_master_cpu, NO_CPU); |
804 | return count; | 804 | return count; |
805 | } else { | 805 | } else { |
diff --git a/litmus/norqlock.c b/litmus/norqlock.c index b812f34960..1a17d6c3ac 100644 --- a/litmus/norqlock.c +++ b/litmus/norqlock.c | |||
@@ -50,7 +50,7 @@ void tick_no_rqlock(void) | |||
50 | 50 | ||
51 | local_irq_save(flags); | 51 | local_irq_save(flags); |
52 | 52 | ||
53 | wl = &__get_cpu_var(norq_worklist); | 53 | wl = &__get_cpu_var(norq_worklist); |
54 | 54 | ||
55 | if (wl->hrtimer_hack) { | 55 | if (wl->hrtimer_hack) { |
56 | /* bail out! */ | 56 | /* bail out! */ |
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c index dabf196d92..2d0920ccad 100644 --- a/litmus/rt_domain.c +++ b/litmus/rt_domain.c | |||
@@ -163,7 +163,7 @@ static void reinit_release_heap(struct task_struct* t) | |||
163 | 163 | ||
164 | /* initialize */ | 164 | /* initialize */ |
165 | heap_init(&rh->heap); | 165 | heap_init(&rh->heap); |
166 | 166 | ||
167 | atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE); | 167 | atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE); |
168 | } | 168 | } |
169 | 169 | ||