diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2022-04-12 11:28:42 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2022-04-12 11:28:42 +0300 |
| commit | c16c8bfa09d5f318c1bd65698d058d3739970c24 (patch) | |
| tree | a3ac5a1cad695c93d698cfff0b7629fd1a2ff79c /include/linux/watch_queue.h | |
| parent | 8e7e5c077cd57ee9a36d58c65f07257dc49a88d5 (diff) | |
| parent | b85ffe47c4ec172214a38b7e7087c60582c488f0 (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Pull in TTM changes needed for DG2 CCS enabling from Ram.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/linux/watch_queue.h')
| -rw-r--r-- | include/linux/watch_queue.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/watch_queue.h b/include/linux/watch_queue.h index c994d1b2cdba..3b9a40ae8bdb 100644 --- a/include/linux/watch_queue.h +++ b/include/linux/watch_queue.h @@ -28,7 +28,8 @@ struct watch_type_filter { struct watch_filter { union { struct rcu_head rcu; - unsigned long type_filter[2]; /* Bitmask of accepted types */ + /* Bitmask of accepted types */ + DECLARE_BITMAP(type_filter, WATCH_TYPE__NR); }; u32 nr_filters; /* Number of filters */ struct watch_type_filter filters[]; |