diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h
index 5fee43311..d3eeb8cb9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log.h
@@ -40,13 +40,13 @@ enum nvgpu_log_type {
  * of printing data to a UART, log, whatever.
  */
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
-		     enum nvgpu_log_type type, const char *fmt, ...);
+void nvgpu_log_msg_impl(struct gk20a *g, const char *func_name, int line,
+			enum nvgpu_log_type type, const char *fmt, ...);
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask,
-		     const char *func_name, int line,
-		     const char *fmt, ...);
+void nvgpu_log_dbg_impl(struct gk20a *g, u64 log_mask,
+			const char *func_name, int line,
+			const char *fmt, ...);
 
 /*
  * Use this define to set a default mask.
@@ -109,7 +109,7 @@ bool nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask);
  * Print a message if the log_mask matches the enabled debugging.
  */
 #define nvgpu_log(g, log_mask, fmt, arg...)				\
-	__nvgpu_log_dbg(g, log_mask, __func__, __LINE__, fmt, ##arg)
+	nvgpu_log_dbg_impl(g, log_mask, __func__, __LINE__, fmt, ##arg)
 
 /**
  * nvgpu_err - Print an error
@@ -121,7 +121,7 @@ bool nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask);
  * Uncondtionally print an error message.
  */
 #define nvgpu_err(g, fmt, arg...)					\
-	__nvgpu_log_msg(g, __func__, __LINE__, NVGPU_ERROR, fmt, ##arg)
+	nvgpu_log_msg_impl(g, __func__, __LINE__, NVGPU_ERROR, fmt, ##arg)
 
 /**
  * nvgpu_err - Print a warning
@@ -133,7 +133,7 @@ bool nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask);
  * Uncondtionally print a warming message.
  */
 #define nvgpu_warn(g, fmt, arg...)					\
-	__nvgpu_log_msg(g, __func__, __LINE__, NVGPU_WARNING, fmt, ##arg)
+	nvgpu_log_msg_impl(g, __func__, __LINE__, NVGPU_WARNING, fmt, ##arg)
 
 /**
  * nvgpu_info - Print an info message
@@ -145,7 +145,7 @@ bool nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask);
  * Unconditionally print an information message.
  */
 #define nvgpu_info(g, fmt, arg...)					\
-	__nvgpu_log_msg(g, __func__, __LINE__, NVGPU_INFO, fmt, ##arg)
+	nvgpu_log_msg_impl(g, __func__, __LINE__, NVGPU_INFO, fmt, ##arg)
 
 /*
  * Some convenience macros.
@@ -172,7 +172,7 @@ extern u64 nvgpu_dbg_mask;
 #define gk20a_dbg(log_mask, fmt, arg...)				\
 	do {								\
 		if (((log_mask) & nvgpu_dbg_mask) != 0)	{		\
-			__nvgpu_log_msg(NULL, __func__, __LINE__,	\
+			nvgpu_log_msg_impl(NULL, __func__, __LINE__,	\
 					NVGPU_DEBUG, fmt "\n", ##arg);	\
 		}							\
 	} while (false)
diff --git a/drivers/gpu/nvgpu/libnvgpu-drv.export b/drivers/gpu/nvgpu/libnvgpu-drv.export
index b8290eae9..519c32b4b 100644
--- a/drivers/gpu/nvgpu/libnvgpu-drv.export
+++ b/drivers/gpu/nvgpu/libnvgpu-drv.export
@@ -1,7 +1,5 @@
 # Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
 
-__nvgpu_log_dbg
-__nvgpu_log_msg
 bitmap_clear
 bitmap_find_next_zero_area_off
 bitmap_set
@@ -88,6 +86,8 @@ nvgpu_kmem_cache_destroy
 nvgpu_kmem_cache_free
 nvgpu_kmem_get_fault_injection
 nvgpu_kzalloc_impl
+nvgpu_log_dbg_impl
+nvgpu_log_msg_impl
 nvgpu_memset
 nvgpu_mem_create_from_phys
 nvgpu_mem_iommu_translate
diff --git a/drivers/gpu/nvgpu/os/linux/linux-dma.c b/drivers/gpu/nvgpu/os/linux/linux-dma.c
index 4d1b3ebb1..a9abcef0b 100644
--- a/drivers/gpu/nvgpu/os/linux/linux-dma.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-dma.c
@@ -93,7 +93,7 @@ static void __dma_dbg(struct gk20a *g, size_t size, unsigned long flags,
 
 	nvgpu_dma_flags_to_str(g, flags, flags_str);
 
-	__nvgpu_log_dbg(g, gpu_dbg_dma,
+	nvgpu_log_dbg_impl(g, gpu_dbg_dma,
 			func, line,
 			"DMA %s: [%s] size=%-7zu "
 			"aligned=%-7zu total=%-10llukB %s",
diff --git a/drivers/gpu/nvgpu/os/linux/log.c b/drivers/gpu/nvgpu/os/linux/log.c
index df1fb139e..f45bc7d18 100644
--- a/drivers/gpu/nvgpu/os/linux/log.c
+++ b/drivers/gpu/nvgpu/os/linux/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -98,8 +98,8 @@ static void __nvgpu_really_print_log(u32 trace, const char *gpu_name,
 }
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
-		     enum nvgpu_log_type type, const char *fmt, ...)
+void nvgpu_log_msg_impl(struct gk20a *g, const char *func_name, int line,
+			enum nvgpu_log_type type, const char *fmt, ...)
 {
 	char log[LOG_BUFFER_LENGTH];
 	va_list args;
@@ -113,9 +113,9 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
 }
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask,
-		     const char *func_name, int line,
-		     const char *fmt, ...)
+void nvgpu_log_dbg_impl(struct gk20a *g, u64 log_mask,
+			const char *func_name, int line,
+			const char *fmt, ...)
 {
 	char log[LOG_BUFFER_LENGTH];
 	va_list args;
diff --git a/drivers/gpu/nvgpu/os/linux/os_sched.c b/drivers/gpu/nvgpu/os/linux/os_sched.c
index 00b4bf324..f2bbc21f8 100644
--- a/drivers/gpu/nvgpu/os/linux/os_sched.c
+++ b/drivers/gpu/nvgpu/os/linux/os_sched.c
@@ -28,5 +28,5 @@ int nvgpu_current_pid(struct gk20a *g)
 void nvgpu_print_current_impl(struct gk20a *g, const char *func_name, int line,
 		void *ctx, enum nvgpu_log_type type)
 {
-	__nvgpu_log_msg(g, func_name, line, type, current->comm);
+	nvgpu_log_msg_impl(g, func_name, line, type, current->comm);
 }
diff --git a/drivers/gpu/nvgpu/os/posix/log.c b/drivers/gpu/nvgpu/os/posix/log.c
index a17c016b5..d888d4645 100644
--- a/drivers/gpu/nvgpu/os/posix/log.c
+++ b/drivers/gpu/nvgpu/os/posix/log.c
@@ -66,8 +66,8 @@ static void __nvgpu_really_print_log(const char *gpu_name,
 }
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
-		     enum nvgpu_log_type type, const char *fmt, ...)
+void nvgpu_log_msg_impl(struct gk20a *g, const char *func_name, int line,
+			enum nvgpu_log_type type, const char *fmt, ...)
 {
 	char log[LOG_BUFFER_LENGTH];
 	va_list args;
@@ -81,9 +81,9 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
 }
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask,
-		     const char *func_name, int line,
-		     const char *fmt, ...)
+void nvgpu_log_dbg_impl(struct gk20a *g, u64 log_mask,
+			const char *func_name, int line,
+			const char *fmt, ...)
 {
 	char log[LOG_BUFFER_LENGTH];
 	va_list args;
diff --git a/drivers/gpu/nvgpu/os/posix/os_sched.c b/drivers/gpu/nvgpu/os/posix/os_sched.c
index 4055c2101..8d478191a 100644
--- a/drivers/gpu/nvgpu/os/posix/os_sched.c
+++ b/drivers/gpu/nvgpu/os/posix/os_sched.c
@@ -52,8 +52,10 @@ void nvgpu_print_current_impl(struct gk20a *g, const char *func_name, int line,
 
 	/* pthread_getname_np() will return null terminated string on success */
 	if (pthread_getname_np(0, current_tname, CURRENT_NAME_LEN) == 0) {
-		__nvgpu_log_msg(g, func_name, line, type, "%s", current_tname);
+		nvgpu_log_msg_impl(g, func_name, line, type, "%s",
+					current_tname);
 	} else {
-		__nvgpu_log_msg(g, func_name, line, type, "(unknown process)");
+		nvgpu_log_msg_impl(g, func_name, line, type,
+					"(unknown process)");
 	}
 }