nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Define functions static if DEBUG_FS=n

Browse Source 
When turning off CONFIG_DEBUG_FS, there are build errors:
drivers/gpu/nvgpu/os/linux/os_ops_gp106.o: In function `nvgpu_fecs_trace_init_debugfs':
os_ops_gp106.c:(.text+0x8): multiple definition of `nvgpu_fecs_trace_init_debugfs'
drivers/gpu/nvgpu/os/linux/os_ops_gp10b.o:os_ops_gp10b.c:(.text+0x0): first defined here

drivers/gpu/nvgpu/os/linux/os_ops_gv100.o: In function `gp106_therm_init_debugfs':
os_ops_gv100.c:(.text+0x0): multiple definition of `gp106_therm_init_debugfs'
drivers/gpu/nvgpu/os/linux/os_ops_gp106.o:os_ops_gp106.c:(.text+0x0): first defined here

drivers/gpu/nvgpu/os/linux/os_ops_tu104.o: In function `gv100_clk_init_debugfs':
os_ops_tu104.c:(.text+0x0): multiple definition of `gv100_clk_init_debugfs'
drivers/gpu/nvgpu/os/linux/os_ops_gv100.o:os_ops_gv100.c:(.text+0x10): first defined here

This is because those functions aren't marked as static.

So this patch just simply fixes the bug.

Bug 2284925

Change-Id: I1da39345c653dfb50c509adb0c822b4657646c56
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1929355
(cherry picked from commit 0fd9c84f87)
Reviewed-on: https://git-master.nvidia.com/r/1933889
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolin Chen
2018-10-17 15:05:11 -07:00
committed by mobile promotions
parent db8324ff98
commit e1c52e46ea
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h
View File

@@ -20,7 +20,7 @@
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
int gv100_clk_init_debugfs(struct gk20a *g); int gv100_clk_init_debugfs(struct gk20a *g);
#else #else
inline int gv100_clk_init_debugfs(struct gk20a *g) static inline int gv100_clk_init_debugfs(struct gk20a *g)
{ {
return 0; return 0;
} }

2
drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h
View File

@@ -22,7 +22,7 @@ struct gk20a;
#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_GK20A_CTXSW_TRACE) #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_GK20A_CTXSW_TRACE)
int nvgpu_fecs_trace_init_debugfs(struct gk20a *g); int nvgpu_fecs_trace_init_debugfs(struct gk20a *g);
#else #else
int nvgpu_fecs_trace_init_debugfs(struct gk20a *g) static int nvgpu_fecs_trace_init_debugfs(struct gk20a *g)
{ {
return 0; return 0;
} }

2
drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h
View File

@@ -20,7 +20,7 @@
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
int gp106_therm_init_debugfs(struct gk20a *g); int gp106_therm_init_debugfs(struct gk20a *g);
#else #else
inline int gp106_therm_init_debugfs(struct gk20a *g) static inline int gp106_therm_init_debugfs(struct gk20a *g)
{ {
return 0; return 0;
} }