You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/05/08 17:39:52 UTC
(nuttx) branch master updated (c4dbabb1bb -> 90f9ffc2e8)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from c4dbabb1bb drivers/devicetree: Add a set of commonly used FDT utilities.
new e187dbd663 chip/s698pm_cpustart.c: Fix compile error
new 90f9ffc2e8 sched/sched: CONFIG_SCHED_RESUMESCHEDULER macro define error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/sparc/src/s698pm/s698pm_cpustart.c | 6 ++----
include/nuttx/sched.h | 2 +-
sched/Kconfig | 1 -
sched/sched/sched_resumescheduler.c | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
(nuttx) 02/02: sched/sched: CONFIG_SCHED_RESUMESCHEDULER macro define error
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 90f9ffc2e8b555171e1976620af7fac225a15a4b
Author: hujun5 <hu...@xiaomi.com>
AuthorDate: Tue May 7 12:08:46 2024 +0800
sched/sched: CONFIG_SCHED_RESUMESCHEDULER macro define error
we removed "select SCHED_RESUMESCHEDULER",
As SCHED_RESUMESCHEDULER is not a necessary feature in SMP,
turning it on by default may affect performance.
Signed-off-by: hujun5 <hu...@xiaomi.com>
---
include/nuttx/sched.h | 2 +-
sched/Kconfig | 1 -
sched/sched/sched_resumescheduler.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index e71baa5fa6..2dcd7bd9c4 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -1210,7 +1210,7 @@ int group_exitinfo(pid_t pid, FAR struct binary_s *bininfo);
*
****************************************************************************/
-#if CONFIG_RR_INTERVAL > 0 || defined(CONFIG_SCHED_RESUMESCHEDULER)
+#if defined(CONFIG_SCHED_RESUMESCHEDULER)
void nxsched_resume_scheduler(FAR struct tcb_s *tcb);
#else
# define nxsched_resume_scheduler(tcb)
diff --git a/sched/Kconfig b/sched/Kconfig
index b36fbd8cdb..1877b944c4 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -351,7 +351,6 @@ config SMP
depends on ARCH_HAVE_TESTSET
depends on ARCH_INTERRUPTSTACK != 0
select SPINLOCK
- select SCHED_RESUMESCHEDULER
select IRQCOUNT
---help---
Enables support for Symmetric Multi-Processing (SMP) on a multi-CPU
diff --git a/sched/sched/sched_resumescheduler.c b/sched/sched/sched_resumescheduler.c
index 77d6bc92d2..025e0e2a43 100644
--- a/sched/sched/sched_resumescheduler.c
+++ b/sched/sched/sched_resumescheduler.c
@@ -33,7 +33,7 @@
#include "irq/irq.h"
#include "sched/sched.h"
-#if CONFIG_RR_INTERVAL > 0 || defined(CONFIG_SCHED_RESUMESCHEDULER)
+#if defined(CONFIG_SCHED_RESUMESCHEDULER)
/****************************************************************************
* Public Functions
(nuttx) 01/02: chip/s698pm_cpustart.c: Fix compile error
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit e187dbd66358c30b8ead34371b76ac4d2975e9e5
Author: hujun5 <hu...@xiaomi.com>
AuthorDate: Tue May 7 12:06:59 2024 +0800
chip/s698pm_cpustart.c: Fix compile error
chip/s698pm_cpustart.c: In function 's698pm_cpu_boot':
Error: chip/s698pm_cpustart.c:74:17: error: unused variable 'tcb' [-Werror=unused-variable]
struct tcb_s *tcb = this_task();
^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:99: s698pm_cpustart.o] Error 1
make[1]: Target 'libarch.a' not remade because of errors.
make: *** [tools/LibTargets.mk:164: arch/sparc/src/libarch.a] Error 2
make: Target 'all' not remade because of errors.
/github/workspace/sources/nuttx/tools/testbuild.sh: line 370: /github/workspace/sources/nuttx/../nuttx/nuttx.manifest: No such file or directory
Normalize s698pm-dkit/smp
Signed-off-by: hujun5 <hu...@xiaomi.com>
---
arch/sparc/src/s698pm/s698pm_cpustart.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/sparc/src/s698pm/s698pm_cpustart.c b/arch/sparc/src/s698pm/s698pm_cpustart.c
index df58abff83..24ce75feeb 100644
--- a/arch/sparc/src/s698pm/s698pm_cpustart.c
+++ b/arch/sparc/src/s698pm/s698pm_cpustart.c
@@ -71,8 +71,6 @@ volatile static spinlock_t g_cpu_boot;
void s698pm_cpu_boot(void)
{
- struct tcb_s *tcb = this_task();
-
_info("CPU%d Started\n", this_cpu());
/* Initialize CPU interrupts */
@@ -84,12 +82,12 @@ void s698pm_cpu_boot(void)
#ifdef CONFIG_SCHED_INSTRUMENTATION
/* Notify that this CPU has started */
- sched_note_cpu_started(tcb);
+ sched_note_cpu_started(this_task());
#endif
/* Reset scheduler parameters */
- nxsched_resume_scheduler(tcb);
+ nxsched_resume_scheduler(this_task());
/* And finally, enable cpu interrupts */