Module: xenomai-head
Branch: master
Commit: b562fe59a5a1e02d93c71558e54a8bd16bc8a783
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=b562fe59a5a1e02d93c71558e54a8bd16bc8a783
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Wed Jan 5 02:17:33 2011 +0100
sched: Fix leftovers from 74d4cadd28 (sched->status split)
---
include/nucleus/pod.h | 7 +++++--
ksrc/nucleus/shadow.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/nucleus/pod.h b/include/nucleus/pod.h
index d92884c..d683003 100644
--- a/include/nucleus/pod.h
+++ b/include/nucleus/pod.h
@@ -155,13 +155,16 @@ void __xnpod_schedule(struct xnsched *sched);
testbits(nkpod->status, XNFATAL)
#define xnpod_interrupt_p() \
- testbits(xnpod_current_sched()->status, XNINIRQ)
+ testbits(xnpod_current_sched()->lflags, XNINIRQ)
#define xnpod_callout_p() \
testbits(xnpod_current_sched()->status, XNKCOUT)
#define xnpod_asynch_p() \
- testbits(xnpod_current_sched()->status, XNKCOUT|XNINIRQ)
+ ({ \
+ xnsched_t *sched = xnpod_current_sched(); \
+ testbits(sched->status | sched->lflags, XNKCOUT|XNINIRQ); \
+ })
#define xnpod_current_thread() \
(xnpod_current_sched()->curr)
diff --git a/ksrc/nucleus/shadow.c b/ksrc/nucleus/shadow.c
index 2f7c966..6391889 100644
--- a/ksrc/nucleus/shadow.c
+++ b/ksrc/nucleus/shadow.c
@@ -334,7 +334,7 @@ static void rpi_clear_remote(struct xnthread *thread)
* priority.
*/
if (rcpu != -1 && rcpu != rthal_processor_id()) {
- if (!testbits(rpi->status, XNRPICK)) {
+ if (!testbits(rpi->rpistatus, XNRPICK)) {
__setbits(rpi->rpistatus, XNRPICK);
xnlock_put_irqrestore(&rpi->rpilock, s);
goto exit_send_ipi;
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
