-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Move the conflicting declaration to the end of the corresponding
structure. Notice that `struct dev_pagemap` is a flexible structure,
this is a structure that contains a flexible-array member.

Fix 56 of the following type of warnings:
drivers/gpu/drm/xe/xe_vram_types.h:69:28: warning: structure containing a 
flexible array member is not at the end of another structure 
[-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <gustavo...@kernel.org>
---
 drivers/gpu/drm/xe/xe_vram_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_vram_types.h 
b/drivers/gpu/drm/xe/xe_vram_types.h
index 83772dcbf1af..183d358da741 100644
--- a/drivers/gpu/drm/xe/xe_vram_types.h
+++ b/drivers/gpu/drm/xe/xe_vram_types.h
@@ -66,8 +66,6 @@ struct xe_vram_region {
 #if IS_ENABLED(CONFIG_DRM_XE_PAGEMAP)
        /** @migrate: Back pointer to migrate */
        struct xe_migrate *migrate;
-       /** @pagemap: Used to remap device memory as ZONE_DEVICE */
-       struct dev_pagemap pagemap;
        /**
         * @dpagemap: The struct drm_pagemap of the ZONE_DEVICE memory
         * pages of this tile.
@@ -79,6 +77,8 @@ struct xe_vram_region {
         * This is generated when remap device memory as ZONE_DEVICE
         */
        resource_size_t hpa_base;
+       /** @pagemap: Used to remap device memory as ZONE_DEVICE */
+       struct dev_pagemap pagemap;
 #endif
 };
 
-- 
2.43.0


Reply via email to