X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fpreempt.c;h=398e8efe00221aae63ea7375c2a5ec58f0a82362;hb=68ac3bfba91119369e42240a732f542c0c6d2736;hp=c3d212d446b30c9816d86cbc858515e0c304e517;hpb=d3860ea45a63b0443e4e75a16b402ada83078d12;p=bertos.git

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index c3d212d4..398e8efe 100644
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -40,11 +40,11 @@
  * In the POSIX implementaiton, context switching is done by the portable
  * SVR4 swapcontext() facility.
  *
- * \version $Id: proc.c 1616 2008-08-10 19:41:26Z bernie $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
 
 #if CONFIG_KERN_PREEMPT
 
@@ -61,11 +61,12 @@
 #include <cfg/depend.h>    // CONFIG_DEPEND()
 
 // Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_PREEMPT,    CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
+CONFIG_DEPEND(CONFIG_KERN_PREEMPT, CONFIG_KERN && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
 
 MOD_DEFINE(preempt)
 
-int preempt_forbid_cnt;
+/// Global preemption disabling nesting counter
+cpu_atomic_t _preempt_forbid_cnt;
 
 static Timer preempt_timer;
 
@@ -74,7 +75,7 @@ void proc_schedule(void)
 {
 	IRQ_DISABLE;
 
-	ASSERT(preempt_forbid_cnt == 0);
+	ASSERT(proc_allowed());
 	LIST_ASSERT_VALID(&ProcReadyList);
 	CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
 	ASSERT2(CurrentProcess, "no idle proc?");
@@ -86,7 +87,7 @@ void proc_schedule(void)
 
 void proc_preempt(UNUSED_ARG(void *, param))
 {
-	if (!preempt_forbid_cnt)
+	if (proc_allowed())
 	{
 		IRQ_DISABLE;
 
@@ -122,7 +123,7 @@ void proc_switch(void)
 
 	/* Sleeping with IRQs disabled or preemption forbidden is illegal */
 	IRQ_ASSERT_ENABLED();
-	ASSERT(preempt_forbid_cnt == 0);
+	ASSERT(proc_allowed());
 
 	// Will invoke proc_switch() in interrupt context
 	kill(0, SIGUSR1);