diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-01-22 15:10:10 -0800 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-01-22 15:10:10 -0800 |
| commit | be3382ecdf317f005e7d47356d0a9256cc36dd88 (patch) | |
| tree | 40ee42db6c5c510d998c23696a27254f22289094 /include/linux/shm.h | |
| parent | f6bf0424cadc27d7cf6a049d2db960e4b52fa513 (diff) | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
Merge drm/drm-next into drm-xe-next
Sync to v6.8-rc1.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'include/linux/shm.h')
| -rw-r--r-- | include/linux/shm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/shm.h b/include/linux/shm.h index d8e69aed3d32..c55bef0538e5 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -2,12 +2,12 @@ #ifndef _LINUX_SHM_H_ #define _LINUX_SHM_H_ -#include <linux/list.h> +#include <linux/types.h> #include <asm/page.h> -#include <uapi/linux/shm.h> #include <asm/shmparam.h> struct file; +struct task_struct; #ifdef CONFIG_SYSVIPC struct sysv_shm { |