Changes from runniing version of the kernel

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
 config SCHED_TASK_TRACE_SHIFT
        int "Buffer size for sched_trace_xxx() events"
        depends on SCHED_TASK_TRACE
-       range 8 13
+       range 8 20
        default 9
        help
 
@@ -194,7 +194,7 @@ config SCHED_DEBUG_TRACE
 config SCHED_DEBUG_TRACE_SHIFT
        int "Buffer size for TRACE() buffer"
        depends on SCHED_DEBUG_TRACE
-       range 14 22
+       range 14 24
        default 18
        help
 
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)
                         set_sched_state(PICKED_WRONG_TASK);
                 else
                         set_sched_state(WILL_SCHEDULE);
-        } else
-                /* Litmus tasks should never be subject to a remote
-                 * set_tsk_need_resched(). */
-                BUG_ON(is_realtime(tsk));
+        } /* else */
+          /*    /\* Litmus tasks should never be subject to a remote */
+          /*     * set_tsk_need_resched(). *\/ */
+          /*    BUG_ON(is_realtime(tsk)); */
         TRACE_TASK(tsk, "set_tsk_need_resched() ret:%p\n",
                    __builtin_return_address(0));
 }
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,
  * should be 8M; it is the max we can ask to buddy system allocator (MAX_ORDER)
  * and we might not get as much
  */
-#define NO_TIMESTAMPS (2 << 11)
+#define NO_TIMESTAMPS (2 << 13)
 
 static int alloc_timestamp_buffer(struct ftdev* ftdev, unsigned int idx)
 {