git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3943 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 2 insertions, 2 deletions

diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 3dd226b1b..808e06300 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -269,7 +269,7 @@ bool_t chSchIsPreemptionRequired(void) {
      if the first thread on the ready queue has a higher priority.

      Otherwise, if the running thread has used up its time quantum, reschedule

      if the first thread on the ready queue has equal or higher priority.*/

-  return currp->r_preempt ? p1 > p2 : p1 >= p2;

+  return currp->p_preempt ? p1 > p2 : p1 >= p2;

 #else

   /* If the round robin preemption feature is not enabled then performs a

      simpler comparison.*/

diff --git a/todo.txt b/todo.txt
index 3ad4037fa..04ca10f0b 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,7 +12,7 @@ X SDC driver port to STM32F2 and STM32F4.
 - CAN2 support and CAN driver test on STM32F2/F4.

 

 Within 2.5.x:

-- Revision of scheduling strategy for threads at equal priority.

+* Revision of scheduling strategy for threads at equal priority.

 - Handling of Virtual Timer callbacks out of critical zone.

 - Add normal API (not iclass) variants of the VT functions.

 - Add the RTC service inside the kernel and port, remove from HAL.