[incubator-nuttx] 05/06: Revert "arch: armv7-a: Fix the pause handler for SMP"

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 5a941d4913b4c07edb05260c091d013c51868d1a
Author: Masayuki Ishikawa <masayuki.ishik...@gmail.com>
AuthorDate: Wed Nov 25 06:58:49 2020 +0900

    Revert "arch: armv7-a: Fix the pause handler for SMP"
    
    This reverts commit 1978dcc9a98c5adb3eb5851ab5e3846b2de2f95c.
---
 arch/arm/src/armv7-a/arm_cpupause.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/arch/arm/src/armv7-a/arm_cpupause.c 
b/arch/arm/src/armv7-a/arm_cpupause.c
index 36d1eb0..4725418 100644
--- a/arch/arm/src/armv7-a/arm_cpupause.c
+++ b/arch/arm/src/armv7-a/arm_cpupause.c
@@ -205,7 +205,6 @@ int up_cpu_paused(int cpu)
 int arm_pause_handler(int irq, FAR void *context, FAR void *arg)
 {
   int cpu = this_cpu();
-  int ret = OK;
 
   /* Check for false alarms.  Such false could occur as a consequence of
    * some deadlock breaking logic that might have already serviced the SG2
@@ -215,21 +214,10 @@ int arm_pause_handler(int irq, FAR void *context, FAR 
void *arg)
 
   if (spin_islocked(&g_cpu_paused[cpu]))
     {
-      /* NOTE: up_cpu_paused() needs to be executed in a critical section
-       * to ensure that this CPU holds g_cpu_irqlock. However, adding
-       * a critical section in up_cpu_paused() is not a good idea,
-       * because it is also called in enter_critical_section() to break
-       * a deadlock
-       */
-
-      irqstate_t flags = enter_critical_section();
-
-      ret = up_cpu_paused(cpu);
-
-      leave_critical_section(flags);
+      return up_cpu_paused(cpu);
     }
 
-  return ret;
+  return OK;
 }
 
 /****************************************************************************