From 59be9b9c4f3bee1aa312a28a1f1f368536c82525 Mon Sep 17 00:00:00 2001 From: Zhang Xiaoxu Date: Mon, 13 Jan 2020 18:40:09 +0800 Subject: [PATCH] drm/i915: Fix multiple definition of 'i915_vma_capture_finish' If 'CONFIG_DRM_I915_CAPTURE_ERROR' not configured, there are some errors like: drivers/gpu/drm/i915/i915_irq.o: In function `i915_vma_capture_finish': ./drivers/gpu/drm/i915/i915_gpu_error.h:312: multiple definition of `i915_vma_capture_finish' drivers/gpu/drm/i915/i915_drv.o: ./drivers/gpu/drm/i915/i915_gpu_error.h:312: first defined here So, add 'static inline' on the defineation of the 'i915_vma_capture_finish' Fixes: d713e3ab93fdc("drm/i915: Correct typo in i915_vma_compress_finish stub") Reported-by: Hulk Robot Signed-off-by: Zhang Xiaoxu Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20200113104009.13274-1-zhangxiaoxu5@huawei.com --- drivers/gpu/drm/i915/i915_gpu_error.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h index 1c80044..3c68c41 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.h +++ b/drivers/gpu/drm/i915/i915_gpu_error.h @@ -309,8 +309,9 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt) return NULL; } -void i915_vma_capture_finish(struct intel_gt_coredump *gt, - struct i915_vma_compress *compress) +static inline void +i915_vma_capture_finish(struct intel_gt_coredump *gt, + struct i915_vma_compress *compress) { } -- 2.7.4