| Message ID | 20200113104009.13274-1-zhangxiaoxu5@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix multiple definition of 'i915_vma_capture_finish' | expand |
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h index 1b6dfcb79e14..6bc7e7c901ed 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.h +++ b/drivers/gpu/drm/i915/i915_gpu_error.h @@ -307,7 +307,7 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt) return NULL; } -void i915_vma_capture_finish(struct intel_gt_coredump *gt, +static inline void i915_vma_capture_finish(struct intel_gt_coredump *gt, struct i915_vma_compress *compress) { }
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 <hulkci@huawei.com> Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> --- drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)