diff --git a/include/nuttx/tls.h b/include/nuttx/tls.h
index 33d65ac445d..a3f7be7b2c6 100644
--- a/include/nuttx/tls.h
+++ b/include/nuttx/tls.h
@@ -304,7 +304,7 @@ uintptr_t task_tls_get_value(int tlsindex);
 
 #if defined(up_tls_info)
 #  define tls_get_info() up_tls_info()
-#elif defined(CONFIG_TLS_ALIGNED)
+#elif defined(CONFIG_TLS_ALIGNED) && !defined(__KERNEL__)
 #  define tls_get_info() TLS_INFO(up_getsp())
 #else
 FAR struct tls_info_s *tls_get_info(void);
diff --git a/libs/libc/tls/tls_getinfo.c b/libs/libc/tls/tls_getinfo.c
index 01804fefc4a..68b580a9321 100644
--- a/libs/libc/tls/tls_getinfo.c
+++ b/libs/libc/tls/tls_getinfo.c
@@ -30,7 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/tls.h>
 
-#if !defined(up_tls_info) && !defined(CONFIG_TLS_ALIGNED)
+#if !defined(up_tls_info) && (defined(__KERNEL__) || !defined(CONFIG_TLS_ALIGNED))
 
 /****************************************************************************
  * Public Functions
@@ -72,4 +72,4 @@ FAR struct tls_info_s *tls_get_info(void)
   return info;
 }
 
-#endif /* !defined(up_tls_info) && !defined(CONFIG_TLS_ALIGNED) */
+#endif /* !defined(up_tls_info) && (defined(__KERNEL__) || !defined(CONFIG_TLS_ALIGNED)) */