From e1c52e46ea383dd280f9d65a4e34422fd9f3637a Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Wed, 17 Oct 2018 15:05:11 -0700 Subject: gpu: nvgpu: Define functions static if DEBUG_FS=n 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 Reviewed-on: https://git-master.nvidia.com/r/1929355 (cherry picked from commit 0fd9c84f870731705d6fdbf83d8e94519ff9d3bd) Reviewed-on: https://git-master.nvidia.com/r/1933889 GVS: Gerrit_Virtual_Submit Reviewed-by: Vinayak Pane Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h | 2 +- drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h | 2 +- drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h index 38ba61bd..419b4abf 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h +++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.h @@ -20,7 +20,7 @@ #ifdef CONFIG_DEBUG_FS int gv100_clk_init_debugfs(struct gk20a *g); #else -inline int gv100_clk_init_debugfs(struct gk20a *g) +static inline int gv100_clk_init_debugfs(struct gk20a *g) { return 0; } diff --git a/drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h b/drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h index a545f2db..54ebaaf9 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h +++ b/drivers/gpu/nvgpu/os/linux/debug_fecs_trace.h @@ -22,7 +22,7 @@ struct gk20a; #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_GK20A_CTXSW_TRACE) int nvgpu_fecs_trace_init_debugfs(struct gk20a *g); #else -int nvgpu_fecs_trace_init_debugfs(struct gk20a *g) +static int nvgpu_fecs_trace_init_debugfs(struct gk20a *g) { return 0; } diff --git a/drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h b/drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h index 6ebc9f58..3e9380df 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h +++ b/drivers/gpu/nvgpu/os/linux/debug_therm_gp106.h @@ -20,7 +20,7 @@ #ifdef CONFIG_DEBUG_FS int gp106_therm_init_debugfs(struct gk20a *g); #else -inline int gp106_therm_init_debugfs(struct gk20a *g) +static inline int gp106_therm_init_debugfs(struct gk20a *g) { return 0; } -- cgit v1.2.2