linux-kernel - [PATCH] drm/msm/rd: fix msm_rd_dump

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 27 Nov 2017 14:51:13 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     Rob Clark <robdclark@...il.com>, David Airlie <airlied@...ux.ie>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Jordan Crouse <jcrouse@...eaurora.org>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Eric Anholt <eric@...olt.net>,
        Archit Taneja <architt@...eaurora.org>,
        Sushmita Susheelendra <ssusheel@...eaurora.org>,
        linux-arm-msm@...r.kernel.org, dri-devel@...ts.freedesktop.org,
        freedreno@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: [PATCH] drm/msm/rd: fix msm_rd_dump_submit() prototype

A build regression has appeared in linux-4.15-rc from an API change,
in configurations without CONFIG_DEBUG_FS:

In file included from drivers/gpu/drm/msm/msm_gpu.h:24:0,
                 from drivers/gpu/drm/msm/msm_gpu.c:18:
drivers/gpu/drm/msm/msm_drv.h:306:20: note: expected 'struct msm_gem_submit *' but argument is of type 'struct msm_rd_state *'
 static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
                    ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/msm/msm_gpu.c:295:4: error: too many arguments to function 'msm_rd_dump_submit'

This changes the prototype of the stub function the same way as the
regualar prototype.

Fixes: 998b9a588314 ("drm/msm/rd: allow adding addition msg to top of dump")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
 drivers/gpu/drm/msm/msm_drv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index c646843d8822..9696f796b3c3 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -303,7 +303,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor);
 void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);
 #else
 static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }
-static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
+static inline void msm_rd_dump_submit(struct msm_rd_state *rd,
+		struct msm_gem_submit *submit, const char *fmt, ...) {}
 static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}
 static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}
 #endif
-- 
2.9.0