You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2020/11/24 21:59:06 UTC
[incubator-nuttx] 06/06: Revert "arch: cxd56xx: Fix the pause
handler for SMP"
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch revert-2348-fix_pause_handler_for_smp
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit aa93cf42580c713c9cec2f17fb924927ce270502
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Nov 25 06:58:49 2020 +0900
Revert "arch: cxd56xx: Fix the pause handler for SMP"
This reverts commit 55c00ad3d979ecf5d11530eaf15abfc4dcfce73f.
---
arch/arm/src/cxd56xx/cxd56_cpupause.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c
index 1f5e6b4..c8bd410 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpupause.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c
@@ -283,7 +283,6 @@ int up_cpu_paused(int cpu)
int arm_pause_handler(int irq, void *c, FAR void *arg)
{
int cpu = up_cpu_index();
- int ret = OK;
DPRINTF("cpu%d will be paused \n", cpu);
@@ -298,21 +297,10 @@ int arm_pause_handler(int irq, void *c, 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;
}
/****************************************************************************