Fix up some problems/issues remaining from PR 1007

1. Add missing conditional logic in include/sys/syscall_lookup.h 2. CONFIG_NPTHREAD_KEYS removed from code but was still in sched/Kconfig 3. Refresh all configurations affected by PR 1007 4. syscall/syscall_funclookup.c needs to include nuttx/tls.h
2020-05-08 12:02:42 -06:00 · 2020-05-08 12:02:42 -06:00 · 4301682fbc
commit 4301682fbc
parent 9ce03b1660
32 changed files with 49 additions and 73 deletions
--- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
@ -35,7 +35,6 @@ CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
@ -64,6 +63,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
@ -35,7 +35,6 @@ CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
@ -64,6 +63,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig
+++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
@ -49,7 +49,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
@ -76,6 +75,7 @@ CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
+++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
@ -32,7 +32,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
@ -61,6 +60,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_UART1_RXBUFSIZE=64
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UART1_TXBUFSIZE=64
--- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
@ -33,7 +33,6 @@ CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
@ -62,6 +61,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
--- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
@ -56,6 +55,7 @@ CONFIG_STM32_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
@ -79,7 +79,6 @@ CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_NFILE_STREAMS=5
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
@ -132,6 +131,7 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=12
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
@ -67,7 +67,6 @@ CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_NFILE_STREAMS=5
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
@ -118,6 +117,7 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=12
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
@ -43,7 +43,6 @@ CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_NFILE_STREAMS=5
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
@ -96,6 +95,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=12
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
@ -44,7 +44,6 @@ CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
 CONFIG_NFILE_DESCRIPTORS=5
 CONFIG_NFILE_STREAMS=5
-CONFIG_TLS_NELEM=0
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=2
@ -80,6 +79,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_TASK_NAME_SIZE=12
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
+++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
@ -40,7 +40,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
@ -74,6 +73,7 @@ CONFIG_STM32_RTC=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
--- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig
@ -31,7 +31,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
@ -60,6 +59,7 @@ CONFIG_STM32_USART1=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_BAUD=57600
 CONFIG_USART1_RXBUFSIZE=64
 CONFIG_USART1_SERIAL_CONSOLE=y
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig
@ -32,7 +32,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
@ -61,6 +60,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig
@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
@ -54,6 +53,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig
@ -35,7 +35,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
@ -66,6 +65,7 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_STACKSIZE=1024
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig
@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig
@ -29,7 +29,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CP=y
@ -60,6 +59,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_RXBUFSIZE=32
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USART2_TXBUFSIZE=32
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig
@ -31,7 +31,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CP=y
@ -62,6 +61,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig
@ -36,7 +36,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig
@ -43,7 +43,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
@ -109,6 +108,7 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 CONFIG_TIMER=y
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig
@ -27,7 +27,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
@ -52,6 +51,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig
@ -29,7 +29,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
@ -54,6 +53,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig
@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
@ -65,6 +64,7 @@ CONFIG_STM32F0L0G0_USART2=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART2_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig
@ -28,7 +28,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
@ -56,6 +55,7 @@ CONFIG_STM32F0L0G0_USART1=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig
@ -28,7 +28,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MM_SMALL=y
 CONFIG_NFILE_DESCRIPTORS=6
 CONFIG_NFILE_STREAMS=6
-CONFIG_TLS_NELEM=0
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
@ -56,6 +55,7 @@ CONFIG_STM32F0L0G0_USART1=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
+CONFIG_TLS_NELEM=0
 CONFIG_USART1_RXBUFSIZE=32
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART1_TXBUFSIZE=32
--- a/boards/arm/tiva/eagle100/configs/httpd/defconfig
+++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig
@ -34,7 +34,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
-CONFIG_TLS_NELEM=0
 CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_WDOGS=8
@ -60,6 +59,7 @@ CONFIG_TIVA_GPIOF_IRQS=y
 CONFIG_TIVA_GPIOG_IRQS=y
 CONFIG_TIVA_SSI0=y
 CONFIG_TIVA_UART0=y
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_WDOG_INTRESERVE=1
--- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
+++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
@ -15,8 +15,8 @@ CONFIG_ARCH_INTERRUPTSTACK=128
 CONFIG_ARCH_RENESAS=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARD_LOOPSPERMSEC=16945
-CONFIG_DEFAULT_SMALL=y
 CONFIG_CONSOLE_SYSLOG=y
+CONFIG_DEFAULT_SMALL=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_ENDIAN_BIG=y
@ -26,7 +26,6 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_MOTOROLA_SREC=y
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
-CONFIG_TLS_NELEM=0
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PREALLOC_WDOGS=8
@ -43,6 +42,7 @@ CONFIG_START_MONTH=2
 CONFIG_START_YEAR=2009
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_TESTING_OSTEST=y
+CONFIG_TLS_NELEM=0
 CONFIG_USERMAIN_STACKSIZE=256
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_WDOG_INTRESERVE=1
--- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
@ -37,7 +37,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
-CONFIG_TLS_NELEM=0
 CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_WDOGS=8
@ -50,6 +49,7 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2009
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_TASK_NAME_SIZE=0
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_BAUD=57600
 CONFIG_UART0_BITS=0
 CONFIG_UART0_RXBUFSIZE=32
--- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
@ -35,7 +35,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
-CONFIG_TLS_NELEM=0
 CONFIG_NUNGET_CHARS=0
 CONFIG_PIPES=y
 CONFIG_PREALLOC_WDOGS=8
@ -49,6 +48,7 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2009
 CONFIG_STDIO_DISABLE_BUFFERING=y
 CONFIG_TASK_NAME_SIZE=0
+CONFIG_TLS_NELEM=0
 CONFIG_UART0_BAUD=57600
 CONFIG_UART0_BITS=0
 CONFIG_UART0_RXBUFSIZE=32
--- a/include/sys/syscall_lookup.h
+++ b/include/sys/syscall_lookup.h
@ -283,8 +283,10 @@ SYSCALL_LOOKUP(telldir,                    1)
  SYSCALL_LOOKUP(shmdt,                    1)
 #endif

+#if CONFIG_TLS_NELEM > 0
  SYSCALL_LOOKUP(tls_alloc,                0)
  SYSCALL_LOOKUP(tls_free,                 1)
+#endif

 /* The following are defined if pthreads are enabled */

--- a/sched/Kconfig
+++ b/sched/Kconfig
@ -642,17 +642,7 @@ config SCHED_USER_IDENTITY
 endmenu # Tasks and Scheduling

 menu "Pthread Options"
-
-config NPTHREAD_KEYS
-	int "Maximum number of pthread keys"
-	default 4 if !DISABLE_PTHREAD
-	default 0 if DISABLE_PTHREAD
-	range 0 32
-	---help---
-		The number of items of thread-specific data that can be retained.
-		The value zero disables support for pthread-specific data.
-
-if !DISABLE_PTHREAD
+	depends on !DISABLE_PTHREAD

 config PTHREAD_MUTEX_TYPES
 	bool "Enable mutex types"
@ -732,8 +722,6 @@ config CANCELLATION_POINTS
 		cancellation points will also used with the () task_delete() API even if
 		pthreads are not enabled.

-endif # !DISABLE_PTHREAD
-
 endmenu # Pthread Options

 menu "Performance Monitoring"
--- a/syscall/syscall_funclookup.c
+++ b/syscall/syscall_funclookup.c
@ -1,35 +1,20 @@
 /****************************************************************************
 * syscall/syscall_funclookup.c
 *
- *   Copyright (C) 2011-2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
 *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ *   http://www.apache.org/licenses/LICENSE-2.0
 *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
 *
 ****************************************************************************/

@ -47,14 +32,15 @@
 #if defined(CONFIG_LIB_SYSCALL) && defined(__KERNEL__)

 #include <nuttx/arch.h>
-#include <nuttx/binfmt/binfmt.h>
-#include <nuttx/drivers/drivers.h>
-#include <nuttx/fs/fs.h>
 #include <nuttx/module.h>
 #include <nuttx/sched.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/spawn.h>
+#include <nuttx/tls.h>
 #include <nuttx/syslog/syslog.h>
+#include <nuttx/binfmt/binfmt.h>
+#include <nuttx/drivers/drivers.h>
+#include <nuttx/fs/fs.h>

 #include <sys/boardctl.h>
 #include <sys/ioctl.h>