aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--litmus/Kconfig4
-rw-r--r--litmus/preempt.c8
-rw-r--r--litmus/trace.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/litmus/Kconfig b/litmus/Kconfig
index d629a2843584..4635ac9a6cbb 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -153,7 +153,7 @@ config SCHED_TASK_TRACE
153config SCHED_TASK_TRACE_SHIFT 153config SCHED_TASK_TRACE_SHIFT
154 int "Buffer size for sched_trace_xxx() events" 154 int "Buffer size for sched_trace_xxx() events"
155 depends on SCHED_TASK_TRACE 155 depends on SCHED_TASK_TRACE
156 range 8 13 156 range 8 20
157 default 9 157 default 9
158 help 158 help
159 159
@@ -194,7 +194,7 @@ config SCHED_DEBUG_TRACE
194config SCHED_DEBUG_TRACE_SHIFT 194config SCHED_DEBUG_TRACE_SHIFT
195 int "Buffer size for TRACE() buffer" 195 int "Buffer size for TRACE() buffer"
196 depends on SCHED_DEBUG_TRACE 196 depends on SCHED_DEBUG_TRACE
197 range 14 22 197 range 14 24
198 default 18 198 default 18
199 help 199 help
200 200
diff --git a/litmus/preempt.c b/litmus/preempt.c
index 40e268611462..528d7131fe12 100644
--- a/litmus/preempt.c
+++ b/litmus/preempt.c
@@ -28,10 +28,10 @@ void sched_state_will_schedule(struct task_struct* tsk)
28 set_sched_state(PICKED_WRONG_TASK); 28 set_sched_state(PICKED_WRONG_TASK);
29 else 29 else
30 set_sched_state(WILL_SCHEDULE); 30 set_sched_state(WILL_SCHEDULE);
31 } else 31 } /* else */
32 /* Litmus tasks should never be subject to a remote 32 /* /\* Litmus tasks should never be subject to a remote */
33 * set_tsk_need_resched(). */ 33 /* * set_tsk_need_resched(). *\/ */
34 BUG_ON(is_realtime(tsk)); 34 /* BUG_ON(is_realtime(tsk)); */
35 TRACE_TASK(tsk, "set_tsk_need_resched() ret:%p\n", 35 TRACE_TASK(tsk, "set_tsk_need_resched() ret:%p\n",
36 __builtin_return_address(0)); 36 __builtin_return_address(0));
37} 37}
diff --git a/litmus/trace.c b/litmus/trace.c
index 219fb46deb34..209524fd345e 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -116,7 +116,7 @@ feather_callback void save_timestamp_cpu(unsigned long event,
116 * should be 8M; it is the max we can ask to buddy system allocator (MAX_ORDER) 116 * should be 8M; it is the max we can ask to buddy system allocator (MAX_ORDER)
117 * and we might not get as much 117 * and we might not get as much
118 */ 118 */
119#define NO_TIMESTAMPS (2 << 11) 119#define NO_TIMESTAMPS (2 << 13)
120 120
121static int alloc_timestamp_buffer(struct ftdev* ftdev, unsigned int idx) 121static int alloc_timestamp_buffer(struct ftdev* ftdev, unsigned int idx)
122{ 122{