diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-02-20 11:45:17 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-02-20 11:45:17 -0500 |
commit | 4d628f66d82caa8514db22cba00f1a6d0bf64d40 (patch) | |
tree | b288e253820c9f3309d731218bb5b2a4ab998f74 | |
parent | d6ddecb0d2cee3880a2785c2b4345336855dc6e5 (diff) |
compiler junk
-rw-r--r-- | include/litmus/ikglp_lock.h | 2 | ||||
-rw-r--r-- | litmus/budget.c | 2 | ||||
-rw-r--r-- | litmus/gpu_affinity.c | 4 | ||||
-rw-r--r-- | litmus/ikglp_lock.c | 2 | ||||
-rw-r--r-- | litmus/kexclu_affinity.c | 2 | ||||
-rw-r--r-- | litmus/nvidia_info.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h index 91a905a5d101..4e69d85d1e37 100644 --- a/include/litmus/ikglp_lock.h +++ b/include/litmus/ikglp_lock.h | |||
@@ -144,7 +144,7 @@ struct ikglp_affinity | |||
144 | unsigned int nr_simult; | 144 | unsigned int nr_simult; |
145 | unsigned int nr_rsrc; | 145 | unsigned int nr_rsrc; |
146 | 146 | ||
147 | int relax_max_fifo_len:1; | 147 | unsigned int relax_max_fifo_len:1; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | static inline struct ikglp_affinity* ikglp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs) | 150 | static inline struct ikglp_affinity* ikglp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs) |
diff --git a/litmus/budget.c b/litmus/budget.c index 518174a37a3b..2ec9d383c332 100644 --- a/litmus/budget.c +++ b/litmus/budget.c | |||
@@ -16,7 +16,7 @@ struct enforcement_timer { | |||
16 | int armed; | 16 | int armed; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | DEFINE_PER_CPU(struct enforcement_timer, budget_timer); | 19 | static DEFINE_PER_CPU(struct enforcement_timer, budget_timer); |
20 | 20 | ||
21 | static enum hrtimer_restart on_enforcement_timeout(struct hrtimer *timer) | 21 | static enum hrtimer_restart on_enforcement_timeout(struct hrtimer *timer) |
22 | { | 22 | { |
diff --git a/litmus/gpu_affinity.c b/litmus/gpu_affinity.c index f4bfb1a67097..e051fb7909a0 100644 --- a/litmus/gpu_affinity.c +++ b/litmus/gpu_affinity.c | |||
@@ -39,7 +39,7 @@ static fp_t update_estimate(feedback_est_t* fb, fp_t a, fp_t b, lt_t observed) | |||
39 | } | 39 | } |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | lt_t varience(lt_t nums[], const lt_t avg, const uint16_t count) | 42 | static lt_t varience(lt_t nums[], const lt_t avg, const uint16_t count) |
43 | { | 43 | { |
44 | /* brute force: takes about as much time as incremental running methods when | 44 | /* brute force: takes about as much time as incremental running methods when |
45 | * count < 50 (on Bonham). Brute force also less prone to overflow. | 45 | * count < 50 (on Bonham). Brute force also less prone to overflow. |
@@ -54,7 +54,7 @@ lt_t varience(lt_t nums[], const lt_t avg, const uint16_t count) | |||
54 | return sqdeviations/count; | 54 | return sqdeviations/count; |
55 | } | 55 | } |
56 | 56 | ||
57 | lt_t isqrt(lt_t n) | 57 | static lt_t isqrt(lt_t n) |
58 | { | 58 | { |
59 | /* integer square root using babylonian method | 59 | /* integer square root using babylonian method |
60 | * (algo taken from wikipedia */ | 60 | * (algo taken from wikipedia */ |
diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c index cab0d7f938f9..b0c8afe90122 100644 --- a/litmus/ikglp_lock.c +++ b/litmus/ikglp_lock.c | |||
@@ -552,7 +552,7 @@ static void ikglp_remove_donation_from_fq_waiter(struct task_struct *t, | |||
552 | 552 | ||
553 | raw_spin_lock(&tsk_rt(t)->hp_blocked_tasks_lock); | 553 | raw_spin_lock(&tsk_rt(t)->hp_blocked_tasks_lock); |
554 | 554 | ||
555 | TRACE_CUR("Removing donation from fq waiter %s\%d\n", t->comm, t->pid); | 555 | TRACE_CUR("Removing donation from fq waiter %s/%d\n", t->comm, t->pid); |
556 | 556 | ||
557 | old_max_eff_prio = top_priority(&tsk_rt(t)->hp_blocked_tasks); | 557 | old_max_eff_prio = top_priority(&tsk_rt(t)->hp_blocked_tasks); |
558 | 558 | ||
diff --git a/litmus/kexclu_affinity.c b/litmus/kexclu_affinity.c index 5ef5e54d600d..a81b28e5f7b7 100644 --- a/litmus/kexclu_affinity.c +++ b/litmus/kexclu_affinity.c | |||
@@ -89,4 +89,4 @@ void affinity_observer_new(struct affinity_observer* aff, | |||
89 | aff->ops = ops; | 89 | aff->ops = ops; |
90 | aff->lock = get_lock_from_od(args->lock_od); | 90 | aff->lock = get_lock_from_od(args->lock_od); |
91 | aff->ident = atomic_inc_return(&aff_obs_id_gen); | 91 | aff->ident = atomic_inc_return(&aff_obs_id_gen); |
92 | } \ No newline at end of file | 92 | } |
diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c index 1255d8d6152e..fc4d5297fe6f 100644 --- a/litmus/nvidia_info.c +++ b/litmus/nvidia_info.c | |||
@@ -344,12 +344,12 @@ typedef struct { | |||
344 | #ifdef CONFIG_LITMUS_SOFTIRQD | 344 | #ifdef CONFIG_LITMUS_SOFTIRQD |
345 | klmirqd_callback_t interrupt_callback; | 345 | klmirqd_callback_t interrupt_callback; |
346 | struct task_struct* interrupt_thread; | 346 | struct task_struct* interrupt_thread; |
347 | int interrupt_ready:1; /* todo: make threads check for the ready flag */ | 347 | unsigned int interrupt_ready:1; /* todo: make threads check for the ready flag */ |
348 | 348 | ||
349 | #ifdef CONFIG_LITMUS_NVIDIA_WORKQ_ON_DEDICATED | 349 | #ifdef CONFIG_LITMUS_NVIDIA_WORKQ_ON_DEDICATED |
350 | klmirqd_callback_t workq_callback; | 350 | klmirqd_callback_t workq_callback; |
351 | struct task_struct* workq_thread; | 351 | struct task_struct* workq_thread; |
352 | int workq_ready:1; | 352 | unsigned int workq_ready:1; |
353 | #endif | 353 | #endif |
354 | #endif | 354 | #endif |
355 | 355 | ||