History

Merge 4.19-rc7 into tty-next

We want the fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit 4e1a6062 parents 8ebfe88 0238df6312 files · +2717 −1774Browse files

Showing the changes to include/uapi/linux (3 of 312 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/memfd.h +2 −0
  2. include/uapi/linux/mman.h +2 −0
  3. include/uapi/linux/shm.h +2 −0
include/uapi/linux/memfd.h+2−0
@@ -25,7 +25,9 @@ · 24 unmodified lines
25#define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB25#define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
26#define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB26#define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
27#define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB27#define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
28#define MFD_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
28#define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB29#define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
30#define MFD_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
29#define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB31#define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
30#define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB32#define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
31#define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB33#define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
include/uapi/linux/mman.h+2−0
@@ -28,7 +28,9 @@ · 27 unmodified lines
28#define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB28#define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
29#define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB29#define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
30#define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB30#define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
31#define MAP_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
31#define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB32#define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
33#define MAP_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
32#define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB34#define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
33#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB35#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
34#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB36#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
include/uapi/linux/shm.h+2−0
@@ -65,7 +65,9 @@ struct shmid_ds { · 64 unmodified lines
65#define SHM_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB65#define SHM_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
66#define SHM_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB66#define SHM_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
67#define SHM_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB67#define SHM_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
68#define SHM_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
68#define SHM_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB69#define SHM_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
70#define SHM_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
69#define SHM_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB71#define SHM_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
70#define SHM_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB72#define SHM_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
71#define SHM_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB73#define SHM_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB