Skip to contentSkip to conversation

Pull request: Build fix and RTDM improvements

PATCH Superseded Jan Kiszka 3 participants 13 messages Jun 3, 2009

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Pull request: Build fix and RTDM improvements

Please pull from

git://xenomai.org/xenomai-jki.git for-upstream

Jan Kiszka (3):
nucleus: Add missing header for isspace
RTDM: Instrument rtdm_lock_get for proper use
RTDM: Avoid namespace pollution in RTDM_EXECUTE_ATOMICALLY

 include/rtdm/rtdm_driver.h |   22 +++++++++++++++-------
 ksrc/nucleus/intr.c        |    1 +
 2 files changed, 16 insertions(+), 7 deletions(-)

--
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux

author
#1 lore raw

PATCH 1/3 nucleus: Add missing header for isspace

---

 ksrc/nucleus/intr.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
ksrc/nucleus/intr.c +1 -0
index 81db8bc..97458f5 100644
@@ -973,6 +973,7 @@ int xnintr_query_next(int irq, xnintr_iterator_t *iterator, char *name_buf)
 #ifdef CONFIG_PROC_FS
 
 #include <linux/proc_fs.h>
+#include <linux/ctype.h>
 
 static int format_irq_proc(unsigned int irq, char *str)
 {
author
#2 lore raw

PATCH 2/3 RTDM: Instrument rtdm_lock_get for proper use

In reply to Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +8 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif
 
 /**
  * Release lock without preemption restoration
#3 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 17 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +0 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 10 lines
include/rtdm/rtdm_driver.h +8 -0
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

I also belived that you can avoid the #ifdef DOXYGEN_CPP.

Signature · 1 line
					    Gilles.
author
#4 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 22 lines · Gilles Chanteperdrix
Quoted 21 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +2 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
+#else /* This is how it really works */
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 6 lines
include/rtdm/rtdm_driver.h +6 -0
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Quoted 2 lines

I also belived that you can avoid the #ifdef DOXYGEN_CPP.

Haven't tried recently, but so far doxygen pulled the whole definition into its documents, and I don't when the BUGON to appear there.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
#5 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 31 lines · Jan Kiszka
Quoted 21 lines · Gilles Chanteperdrix
Quoted 20 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +1 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 7 lines
include/rtdm/rtdm_driver.h +7 -0
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 4 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Ok. Got it. So, maybe, what you want is:

if (rthal_local_irq_test())

	xnpod_lock_sched();

rthal_spin_lock

?

Signature · 1 line
					    Gilles.
author
#6 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 36 lines · Gilles Chanteperdrix
Quoted 30 lines · Jan Kiszka
Quoted 21 lines · Gilles Chanteperdrix
Quoted 20 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +1 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 7 lines
include/rtdm/rtdm_driver.h +7 -0
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 4 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Quoted 7 lines

Ok. Got it. So, maybe, what you want is:

if (rthal_local_irq_test())

	xnpod_lock_sched();

rthal_spin_lock

?

That would be a semantical enhancement of rtdm_spin_lock/unlock, but I'm not sure we want it. Because then you can run into bugs if the user forgets to pick the irqsave version for task context when there is also an IRQ context use of the same lock.

So far the semantic of rtdm_lock was very simple: cross-CPU protection via spin lock, local preemption protection via IRQ lock. And that pattern could easily be validated with the instrumentation I posted. And so far no one asked for more. And finally: xnpod_lock/unlock_sched won't be be cheaper than irqsave/restore as it involves a full nklock acquisition - with irqsave/restore...

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
#7 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 49 lines · Jan Kiszka
Quoted 35 lines · Gilles Chanteperdrix
Quoted 30 lines · Jan Kiszka
Quoted 21 lines · Gilles Chanteperdrix
Quoted 20 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +1 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 7 lines
include/rtdm/rtdm_driver.h +7 -0
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 4 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Quoted 7 lines

Ok. Got it. So, maybe, what you want is:

if (rthal_local_irq_test())

	xnpod_lock_sched();

rthal_spin_lock

?

That would be a semantical enhancement of rtdm_spin_lock/unlock, but I'm not sure we want it. Because then you can run into bugs if the user forgets to pick the irqsave version for task context when there is also an IRQ context use of the same lock.

Quoted 6 lines

So far the semantic of rtdm_lock was very simple: cross-CPU protection via spin lock, local preemption protection via IRQ lock. And that pattern could easily be validated with the instrumentation I posted. And so far no one asked for more. And finally: xnpod_lock/unlock_sched won't be be cheaper than irqsave/restore as it involves a full nklock acquisition - with irqsave/restore...

On the other hand, I already had to port some plain Linux drivers to RTDM, and from this perspective, having a one to one mapping of the services is a real win. I also think that equivalents to preempt_enable() and preempt_disable() are missing in the RTDM interface. I found myself calling xnpod_lock_sched()/xnpod_unlock_sched() in some RTDM drivers, which is bad, I know...

Signature · 1 line
					    Gilles.
author
#8 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 56 lines · Gilles Chanteperdrix
Quoted 48 lines · Jan Kiszka
Quoted 35 lines · Gilles Chanteperdrix
Quoted 30 lines · Jan Kiszka
Quoted 21 lines · Gilles Chanteperdrix
Quoted 20 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +1 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 7 lines
include/rtdm/rtdm_driver.h +7 -0
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 4 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Quoted 7 lines

Ok. Got it. So, maybe, what you want is:

if (rthal_local_irq_test())

	xnpod_lock_sched();

rthal_spin_lock

?

That would be a semantical enhancement of rtdm_spin_lock/unlock, but I'm not sure we want it. Because then you can run into bugs if the user forgets to pick the irqsave version for task context when there is also an IRQ context use of the same lock.

Quoted 6 lines

So far the semantic of rtdm_lock was very simple: cross-CPU protection via spin lock, local preemption protection via IRQ lock. And that pattern could easily be validated with the instrumentation I posted. And so far no one asked for more. And finally: xnpod_lock/unlock_sched won't be be cheaper than irqsave/restore as it involves a full nklock acquisition - with irqsave/restore...

Quoted 7 lines

On the other hand, I already had to port some plain Linux drivers to RTDM, and from this perspective, having a one to one mapping of the services is a real win. I also think that equivalents to preempt_enable() and preempt_disable() are missing in the RTDM interface. I found myself calling xnpod_lock_sched()/xnpod_unlock_sched() in some RTDM drivers, which is bad, I know...

Yes, but as long as we have no comparably cheap preempt_enable/disable in Xenomai, I think it is counterproductive to motivate its (potentially heavy) use in drivers.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
#9 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 64 lines · Jan Kiszka
Quoted 55 lines · Gilles Chanteperdrix
Quoted 48 lines · Jan Kiszka
Quoted 35 lines · Gilles Chanteperdrix
Quoted 30 lines · Jan Kiszka
Quoted 21 lines · Gilles Chanteperdrix
Quoted 20 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +1 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 7 lines
include/rtdm/rtdm_driver.h +7 -0
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 4 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means... Hmm, I still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

Quoted 7 lines

Ok. Got it. So, maybe, what you want is:

if (rthal_local_irq_test())

	xnpod_lock_sched();

rthal_spin_lock

?

That would be a semantical enhancement of rtdm_spin_lock/unlock, but I'm not sure we want it. Because then you can run into bugs if the user forgets to pick the irqsave version for task context when there is also an IRQ context use of the same lock.

Quoted 6 lines

So far the semantic of rtdm_lock was very simple: cross-CPU protection via spin lock, local preemption protection via IRQ lock. And that pattern could easily be validated with the instrumentation I posted. And so far no one asked for more. And finally: xnpod_lock/unlock_sched won't be be cheaper than irqsave/restore as it involves a full nklock acquisition - with irqsave/restore...

Quoted 7 lines

On the other hand, I already had to port some plain Linux drivers to RTDM, and from this perspective, having a one to one mapping of the services is a real win. I also think that equivalents to preempt_enable() and preempt_disable() are missing in the RTDM interface. I found myself calling xnpod_lock_sched()/xnpod_unlock_sched() in some RTDM drivers, which is bad, I know...

Quoted 3 lines

Yes, but as long as we have no comparably cheap preempt_enable/disable in Xenomai, I think it is counterproductive to motivate its (potentially heavy) use in drivers.

I do not think the fact that xnpod_lock_sched is heavier than preempt_disable is much of a problem: it is not that much heavier, and if you use it, it is for lengthy critical sections for which you want interrupts enabled, so, its cost is amortized. The problem is that locking the scheduler for a long period of time is bad for the scheduling, it can cause a kind of priority inversions. So, when porting drivers, we should make the critical sections short and use rtdm_lock_get_irqsave, period.

Signature · 1 line
					    Gilles.
#10 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

In reply to Jan Kiszka
Quoted 32 lines · Jan Kiszka
Quoted 22 lines · Gilles Chanteperdrix
Quoted 21 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +2 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
+#else /* This is how it really works */
Quoted 8 lines

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 6 lines
include/rtdm/rtdm_driver.h +6 -0
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 2 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means...

It means "is the stall bit set for the Xenomai pipeline stage", so your test is inverted.

Quoted 4 lines

Hmm, I
still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

No, because this is aligned on the I-pipe internal logic, but we could define rthal_local_irq_disabled() as an alias.

Quoted 8 lines
Quoted 2 lines

I also belived that you can avoid the #ifdef DOXYGEN_CPP.

Haven't tried recently, but so far doxygen pulled the whole definition into its documents, and I don't when the BUGON to appear there.

Jan

Signature · 1 line
Philippe.
author
#11 lore raw

Re: [Xenomai-core] [PATCH 2/3] RTDM: Instrument rtdm_lock_get for proper use

Quoted 31 lines · Philippe Gerum
Quoted 30 lines · Jan Kiszka
Quoted 29 lines · Gilles Chanteperdrix
Quoted 17 lines · Jan Kiszka

In case the user thinks rtdm_lock_get could be used like spin_lock or messes up the IRQ protection for other reasons, catch this with a XENO_BUGON.

---

 include/rtdm/rtdm_driver.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
include/rtdm/rtdm_driver.h +0 -0
index 058a9f8..fe42eea 100644
@@ -655,7 +655,15 @@ typedef unsigned long rtdm_lockctx_t;
  *
  * Rescheduling: never.

include/rtdm/rtdm_driver.h typedef unsigned long rtdm_lockctx_t; · line 666

Quoted 10 lines
include/rtdm/rtdm_driver.h +8 -0
  */
+#ifdef DOXYGEN_CPP /* Beautify doxygen output */
 #define rtdm_lock_get(lock)	rthal_spin_lock(lock)
+#else /* This is how it really works */
+#define rtdm_lock_get(lock)					\
+	do {							\
+		XENO_BUGON(RTDM, rthal_local_irq_test());	\
+		rthal_spin_lock(lock);				\
+	} while (0)
+#endif

Why is it a problem to call rthal_spin_lock with irqs off?

Quoted 5 lines
Quoted 2 lines

Did I messed it up again? I meant it is a problem to call it with irqs *on*. Checking what rthal_local_irq_test() actually means...

It means "is the stall bit set for the Xenomai pipeline stage", so your test is inverted.

Ah, OK, now I got it. A terrible interface.

Quoted 8 lines
Quoted 5 lines

Hmm, I
still think it's correct. Maybe we should rename rthal_local_irq_test to rthal_local_irq_enabled to clarify the usage.

No, because this is aligned on the I-pipe internal logic, but we could define rthal_local_irq_disabled() as an alias.

I think at least Xenomai internal users would not really miss rthal_local_irq_test. However, I will add a proper alias called rthal_local_irq_disabled and clean up at least RTDM's users. spltest would not really benefit from being switched over...

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
author
#12 lore raw

PATCH 3/3 RTDM: Avoid namespace pollution in RTDM_EXECUTE_ATOMICALLY

In reply to Jan Kiszka

---

 include/rtdm/rtdm_driver.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
include/rtdm/rtdm_driver.h +7 -7
index fe42eea..9680010 100644
@@ -595,13 +595,13 @@ int rtdm_select_bind(int fd, rtdm_selector_t *selector,
 	<LEAVE_ATOMIC_SECTION>			\
 }
 #else /* This is how it really works */
-#define RTDM_EXECUTE_ATOMICALLY(code_block)	\
-{						\
-	spl_t s;				\
-						\
-	xnlock_get_irqsave(&nklock, s);		\
-	code_block;				\
-	xnlock_put_irqrestore(&nklock, s);	\
+#define RTDM_EXECUTE_ATOMICALLY(code_block)		\
+{							\
+	spl_t __rtdm_s;					\
+							\
+	xnlock_get_irqsave(&nklock, __rtdm_s);		\
+	code_block;					\
+	xnlock_put_irqrestore(&nklock, __rtdm_s);	\
 }
 #endif
 /** @} Global Lock across Scheduler Invocation */