summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2013-06-06 14:44:54 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2013-06-06 14:44:54 +0900
commit0b46ccbae10d5478ca4ad2e188678632d76d2210 (patch)
tree1c2c33cbaf18f8713e45195076ae3c7aace17bc6
parentc838e3f0e92f60023c95c1138e5fd5e95d24c7ea (diff)
bug fix for flag_sched_rr
-rw-r--r--ChangeLog1
-rw-r--r--chopstx.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 234aceb..f951ec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* entry.c: Include sys.h for clock_init and gpio_init.
* chopstx.c (PREEMPTION_USEC): Fix the value.
+ (sched): Check tp != NULL to see flag_sched_rr.
2013-06-05 Niibe Yutaka <gniibe@fsij.org>
diff --git a/chopstx.c b/chopstx.c
index 0e394e4..9318a38 100644
--- a/chopstx.c
+++ b/chopstx.c
@@ -357,7 +357,7 @@ sched (void)
register struct chx_thread *tp asm ("r0");
tp = chx_ready_pop ();
- if (tp->flag_sched_rr)
+ if (tp && tp->flag_sched_rr)
{
chx_spin_lock (&q_timer.lock);
chx_timer_insert (tp, PREEMPTION_USEC);