summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Bakita <jbakita@cs.unc.edu>2021-03-07 16:58:02 -0500
committerJoshua Bakita <jbakita@cs.unc.edu>2021-03-07 16:58:02 -0500
commit8ef945674e2134366a4c4b85b2f073fc7e3aa4e7 (patch)
tree1b610401571720091e86c5b04353a60ae40bcf6f
parente7425c838eded1f89c39550fae06cda63d8a0e16 (diff)
Add _HARD to a few timers missed by 3713d99f
-rw-r--r--litmus/budget.c2
-rw-r--r--litmus/jobs.c2
-rw-r--r--litmus/rt_domain.c2
-rw-r--r--litmus/sched_pfair.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/litmus/budget.c b/litmus/budget.c
index fd2bdc2f24e5..a0f9a4ab5088 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -110,7 +110,7 @@ static int __init init_budget_enforcement(void)
110 110
111 for (cpu = 0; cpu < NR_CPUS; cpu++) { 111 for (cpu = 0; cpu < NR_CPUS; cpu++) {
112 et = &per_cpu(budget_timer, cpu); 112 et = &per_cpu(budget_timer, cpu);
113 hrtimer_init(&et->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); 113 hrtimer_init(&et->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
114 et->timer.function = on_enforcement_timeout; 114 et->timer.function = on_enforcement_timeout;
115 } 115 }
116 return 0; 116 return 0;
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 43f1f94e0b6e..4fe2408f35fe 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -147,7 +147,7 @@ static long sleep_until_next_release(void)
147 set_current_state(TASK_INTERRUPTIBLE); 147 set_current_state(TASK_INTERRUPTIBLE);
148 tsk_rt(t)->completed = 1; 148 tsk_rt(t)->completed = 1;
149 preempt_enable_no_resched(); 149 preempt_enable_no_resched();
150 err = schedule_hrtimeout(&next_release, HRTIMER_MODE_ABS); 150 err = schedule_hrtimeout(&next_release, HRTIMER_MODE_ABS_HARD);
151 /* If we get woken by a signal, we return early. 151 /* If we get woken by a signal, we return early.
152 * This is intentional; we want to be able to kill tasks 152 * This is intentional; we want to be able to kill tasks
153 * that are waiting for the next job release. 153 * that are waiting for the next job release.
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 12aac565e219..4413d2d4b7ba 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -92,7 +92,7 @@ struct release_heap* release_heap_alloc(int gfp_flags)
92 rh= kmem_cache_alloc(release_heap_cache, gfp_flags); 92 rh= kmem_cache_alloc(release_heap_cache, gfp_flags);
93 if (rh) { 93 if (rh) {
94 /* initialize timer */ 94 /* initialize timer */
95 hrtimer_init(&rh->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); 95 hrtimer_init(&rh->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
96 rh->timer.function = on_release_timer; 96 rh->timer.function = on_release_timer;
97 } 97 }
98 return rh; 98 return rh;
diff --git a/litmus/sched_pfair.c b/litmus/sched_pfair.c
index 74f7d2a5c4d8..9fe6a4cc36f0 100644
--- a/litmus/sched_pfair.c
+++ b/litmus/sched_pfair.c
@@ -739,7 +739,7 @@ out:
739 hrtimer_get_expires(&state->quantum_timer)); 739 hrtimer_get_expires(&state->quantum_timer));
740 hrtimer_start(&state->quantum_timer, 740 hrtimer_start(&state->quantum_timer,
741 hrtimer_get_expires(&state->quantum_timer), 741 hrtimer_get_expires(&state->quantum_timer),
742 HRTIMER_MODE_ABS); 742 HRTIMER_MODE_ABS_HARD);
743 } 743 }
744 744
745 return next; 745 return next;