diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-05-27 06:46:37 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-05-27 06:47:14 +0300 |
| commit | 3e049b6b8f32f25c6967f4cffd8eac6e1e5316f6 (patch) | |
| tree | 4bef241364915337e050fb9ad2ee9458699d631c /include | |
| parent | 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff) | |
| parent | 39bc27bd688066a63e56f7f64ad34fae03fbe3b8 (diff) | |
| download | linux-3e049b6b8f32f25c6967f4cffd8eac6e1e5316f6.tar.xz | |
Merge tag 'drm-misc-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull:
buddy:
- stop using PAGE_SIZE
shmem-helper:
- avoid kernel panic in mmap()
tests:
- buddy: fix PAGE_SIZE dependency
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240523184745.GA11363@localhost.localdomain
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_buddy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/drm/drm_buddy.h b/include/drm/drm_buddy.h index 82570f77e817..2a74fa9d0ce5 100644 --- a/include/drm/drm_buddy.h +++ b/include/drm/drm_buddy.h @@ -56,8 +56,8 @@ struct drm_buddy_block { struct list_head tmp_link; }; -/* Order-zero must be at least PAGE_SIZE */ -#define DRM_BUDDY_MAX_ORDER (63 - PAGE_SHIFT) +/* Order-zero must be at least SZ_4K */ +#define DRM_BUDDY_MAX_ORDER (63 - 12) /* * Binary Buddy System. @@ -85,7 +85,7 @@ struct drm_buddy { unsigned int n_roots; unsigned int max_order; - /* Must be at least PAGE_SIZE */ + /* Must be at least SZ_4K */ u64 chunk_size; u64 size; u64 avail; |