Merge tag 'linux-watchdog-5.5-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux.git] / include / drm / drm_mm.h

diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index 2c3bbb43c7d1a55600c688e08b3abb1a2cdacc83..d7939c0542599bc42711fa6773f450189e83aa7f 100644 (file)
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -168,8 +168,9 @@ struct drm_mm_node {
        struct rb_node rb_hole_addr;
        u64 __subtree_last;
        u64 hole_size;
-       bool allocated : 1;
-       bool scanned_block : 1;
+       unsigned long flags;
+#define DRM_MM_NODE_ALLOCATED_BIT      0
+#define DRM_MM_NODE_SCANNED_BIT                1
 #ifdef CONFIG_DRM_DEBUG_MM
        depot_stack_handle_t stack;
 #endif
@@ -253,7 +254,7 @@ struct drm_mm_scan {
  */
 static inline bool drm_mm_node_allocated(const struct drm_mm_node *node)
 {
-       return node->allocated;
+       return test_bit(DRM_MM_NODE_ALLOCATED_BIT, &node->flags);
 }
 
 /**