aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/locking.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-04-18 21:33:21 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2012-04-18 21:33:21 -0400
commit149ef3b424a49e6b928c5e23fea83380ed95ea38 (patch)
tree38b9a7397875be56f31f9f04f86fcf1f9e4966ac /litmus/locking.c
parentf916cdb8e6a9ee2c917fddb7351e6bb39f6c953e (diff)
Zap line-endings
Diffstat (limited to 'litmus/locking.c')
-rw-r--r--litmus/locking.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/litmus/locking.c b/litmus/locking.c
index fd3c7260319f..e754b2fa2634 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -57,7 +57,7 @@ static int create_generic_lock(void** obj_ref, obj_type_t type, void* __user ar
57 "most uses. (exception: IKGLP donors)\n"); 57 "most uses. (exception: IKGLP donors)\n");
58 } 58 }
59#endif 59#endif
60 lock->type = type; 60 lock->type = type;
61 lock->ident = atomic_inc_return(&lock_id_gen); 61 lock->ident = atomic_inc_return(&lock_id_gen);
62 *obj_ref = lock; 62 *obj_ref = lock;
63 } 63 }
@@ -300,14 +300,14 @@ static long do_litmus_dgl_lock(dgl_wait_state_t *dgl_wait)
300 300
301 TRACE_CUR("As many as %d locks in DGL are pending. Suspending.\n", 301 TRACE_CUR("As many as %d locks in DGL are pending. Suspending.\n",
302 dgl_wait->nr_remaining); 302 dgl_wait->nr_remaining);
303 303
304#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA) 304#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
305 // KLUDGE: don't count this suspension as time in the critical gpu 305 // KLUDGE: don't count this suspension as time in the critical gpu
306 // critical section 306 // critical section
307 if(tsk_rt(dgl_wait->task)->held_gpus) { 307 if(tsk_rt(dgl_wait->task)->held_gpus) {
308 tsk_rt(dgl_wait->task)->suspend_gpu_tracker_on_block = 1; 308 tsk_rt(dgl_wait->task)->suspend_gpu_tracker_on_block = 1;
309 } 309 }
310#endif 310#endif
311 311
312 // note reverse order. see comments in select_next_lock for reason. 312 // note reverse order. see comments in select_next_lock for reason.
313 for(i = dgl_wait->size - 1; i >= 0; --i) { 313 for(i = dgl_wait->size - 1; i >= 0; --i) {