diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 10:05:54 -0700 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 10:33:54 -0700 |
commit | ed7171ff9fabc49ae6ed42fbd082a576473836fc (patch) | |
tree | 62bc21b9b590a7fefb27b6103a121f4386e1815f /include/uapi/linux/mman.h | |
parent | db3461a7743817ad7c73553902231b096616813a (diff) | |
parent | a809b92ee0f84c3f655b16a8b4d04bc3665d954a (diff) |
Merge drm/drm-next into drm-xe-next
Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'include/uapi/linux/mman.h')
-rw-r--r-- | include/uapi/linux/mman.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index a246e11988d5..e89d00528f2f 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -17,6 +17,7 @@ #define MAP_SHARED 0x01 /* Share changes */ #define MAP_PRIVATE 0x02 /* Changes are private */ #define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ +#define MAP_DROPPABLE 0x08 /* Zero memory under memory pressure. */ /* * Huge page size encoding when MAP_HUGETLB is specified, and a huge page |