kernel/arch: rename ARCH_HAS_NANO_FIBER_ABORT to ARCH_HAS_THREAD_ABORT

And also remove now obsolete ARCH_HAS_TASK_ABORT. ARC does not need the options either. Change-Id: Ie52d63178a367ce12b911dacfe2d389f4f75ed2d Signed-off-by: Benjamin Walsh <[email protected]>
sunkaizhu · Dec 17, 2016 · cef368f · cef368f
1 parent 50f4883
commit cef368f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
@@ -259,16 +259,6 @@ config	IRQ_VECTOR_TABLE_BSP
 	help
 	  Not user-selectable, helps build system logic.
 
-config ARCH_HAS_TASK_ABORT
-	bool
-	# omit prompt to signify a "hidden" option
-	default n
-
-config ARCH_HAS_NANO_FIBER_ABORT
-	bool
-	# omit prompt to signify a "hidden" option
-	default n
-
 config CACHE_LINE_SIZE_DETECT
 	bool
 	prompt "Detect d-cache line size at runtime"

diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig
@@ -277,12 +277,7 @@ config ZERO_LATENCY_IRQS
 	Note that this is a somewhat dangerous option: ISRs of priority zero
 	interrupts cannot use any kernel functionality.
 
-config ARCH_HAS_TASK_ABORT
-	bool
-	# omit prompt to signify a "hidden" option
-	default y
-
-config ARCH_HAS_NANO_FIBER_ABORT
+config ARCH_HAS_THREAD_ABORT
 	bool
 	# omit prompt to signify a "hidden" option
 	default y

diff --git a/kernel/unified/thread_abort.c b/kernel/unified/thread_abort.c
@@ -31,7 +31,7 @@
 
 extern void _k_thread_single_abort(struct k_thread *thread);
 
-#if !defined(CONFIG_ARCH_HAS_NANO_FIBER_ABORT)
+#if !defined(CONFIG_ARCH_HAS_THREAD_ABORT)
 void k_thread_abort(k_tid_t thread)
 {
 	unsigned int key;