From 36b676eea6f132916f806587a8dffe7b3040473d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 24 Dec 2016 13:45:11 -0600
Subject: [PATCH] SMP sched_unlock: Should merging depend on g_cpu_irqlock or
 not?  Let's at least be consistent.  And don't use irqcount; use
 g_cpu_irqlock.

---
 sched/sched/sched_unlock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sched/sched/sched_unlock.c b/sched/sched/sched_unlock.c
index 9a6ff5a9248..ff676c827a2 100644
--- a/sched/sched/sched_unlock.c
+++ b/sched/sched/sched_unlock.c
@@ -121,7 +121,7 @@ int sched_unlock(void)
            */
 
 #ifdef CONFIG_SMP
-          if (g_pendingtasks.head != NULL && rtcb->irqcount <= 0)
+          if (!spin_islocked(&g_cpu_schedlock) && g_pendingtasks.head != NULL)
 #else
           if (g_pendingtasks.head != NULL)
 #endif