Fix a (harmless) misplaced #endif leading to declarations appearing multiple times.
Fixes: 0eb2a18a8fad ("drm/xe: Implement VM snapshot support for BO's and userptr") Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: José Roberto de Souza jose.souza@intel.com Cc: stable@vger.kernel.org # v6.9+ Signed-off-by: Thomas Hellström thomas.hellstrom@linux.intel.com --- drivers/gpu/drm/xe/xe_vm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h index f66075f8a6fe..7c8e39049223 100644 --- a/drivers/gpu/drm/xe/xe_vm.h +++ b/drivers/gpu/drm/xe/xe_vm.h @@ -282,9 +282,9 @@ static inline void vm_dbg(const struct drm_device *dev, const char *format, ...) { /* noop */ } #endif -#endif
struct xe_vm_snapshot *xe_vm_snapshot_capture(struct xe_vm *vm); void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap); void xe_vm_snapshot_print(struct xe_vm_snapshot *snap, struct drm_printer *p); void xe_vm_snapshot_free(struct xe_vm_snapshot *snap); +#endif
On Wed, Feb 26, 2025 at 04:33:42PM +0100, Thomas Hellström wrote:
Fix a (harmless) misplaced #endif leading to declarations appearing multiple times.
Fixes: 0eb2a18a8fad ("drm/xe: Implement VM snapshot support for BO's and userptr") Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: José Roberto de Souza jose.souza@intel.com Cc: stable@vger.kernel.org # v6.9+
not sure if it deserves to be propagated to stable since it's harmless. As prep for patch 3, maybe just do v6.12+, but up to you
Reviewed-by: Lucas De Marchi lucas.demarchi@intel.com
Lucas De Marchi
Signed-off-by: Thomas Hellström thomas.hellstrom@linux.intel.com
drivers/gpu/drm/xe/xe_vm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h index f66075f8a6fe..7c8e39049223 100644 --- a/drivers/gpu/drm/xe/xe_vm.h +++ b/drivers/gpu/drm/xe/xe_vm.h @@ -282,9 +282,9 @@ static inline void vm_dbg(const struct drm_device *dev, const char *format, ...) { /* noop */ } #endif -#endif
struct xe_vm_snapshot *xe_vm_snapshot_capture(struct xe_vm *vm); void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap); void xe_vm_snapshot_print(struct xe_vm_snapshot *snap, struct drm_printer *p); void xe_vm_snapshot_free(struct xe_vm_snapshot *snap);
+#endif
2.48.1
-----Original Message----- From: Intel-xe intel-xe-bounces@lists.freedesktop.org On Behalf Of Thomas Hellström Sent: Wednesday, February 26, 2025 9:04 PM To: intel-xe@lists.freedesktop.org Cc: Thomas Hellström thomas.hellstrom@linux.intel.com; Maarten Lankhorst maarten.lankhorst@linux.intel.com; Souza, Jose jose.souza@intel.com; stable@vger.kernel.org Subject: [PATCH 2/4] drm/xe/vm: Fix a misplaced #endif
Fix a (harmless) misplaced #endif leading to declarations appearing multiple times.
Fixes: 0eb2a18a8fad ("drm/xe: Implement VM snapshot support for BO's and userptr") Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: José Roberto de Souza jose.souza@intel.com Cc: stable@vger.kernel.org # v6.9+ Signed-off-by: Thomas Hellström thomas.hellstrom@linux.intel.com
drivers/gpu/drm/xe/xe_vm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h index f66075f8a6fe..7c8e39049223 100644 --- a/drivers/gpu/drm/xe/xe_vm.h +++ b/drivers/gpu/drm/xe/xe_vm.h @@ -282,9 +282,9 @@ static inline void vm_dbg(const struct drm_device *dev, const char *format, ...) { /* noop */ } #endif -#endif
struct xe_vm_snapshot *xe_vm_snapshot_capture(struct xe_vm *vm); void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap); void xe_vm_snapshot_print(struct xe_vm_snapshot *snap, struct drm_printer *p); void xe_vm_snapshot_free(struct xe_vm_snapshot *snap); +#endif
LGTM, Reviewed-by: Tejas Upadhyay tejas.upadhyay@intel.com
Tejas
-- 2.48.1
linux-stable-mirror@lists.linaro.org
-
Lucas De Marchi -
Thomas Hellström -
Upadhyay, Tejas