diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-05-27 11:08:31 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-05-27 11:08:31 +0200 |
| commit | 375c4d1583948cf2439833e4a85d5a0aee853895 (patch) | |
| tree | 821f494e7df09af36887f710cfce1fb89600e666 /include/linux/shm.h | |
| parent | 983095eaf6c161ef73d96152bfc1a99ca051cd57 (diff) | |
| parent | 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff) | |
| download | linux-next-375c4d1583948cf2439833e4a85d5a0aee853895.tar.gz linux-next-375c4d1583948cf2439833e4a85d5a0aee853895.zip | |
Merge drm/drm-next into drm-misc-next
Let's start the new release cycle.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'include/linux/shm.h')
| -rw-r--r-- | include/linux/shm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/shm.h b/include/linux/shm.h index c55bef0538e5..1d3d3ae958fb 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -16,7 +16,6 @@ struct sysv_shm { long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr, unsigned long shmlba); -bool is_file_shm_hugepages(struct file *file); void exit_shm(struct task_struct *task); #define shm_init_task(task) INIT_LIST_HEAD(&(task)->sysvshm.shm_clist) #else @@ -30,10 +29,6 @@ static inline long do_shmat(int shmid, char __user *shmaddr, { return -ENOSYS; } -static inline bool is_file_shm_hugepages(struct file *file) -{ - return false; -} static inline void exit_shm(struct task_struct *task) { } |