History

Merge 4.19-rc7 into usb-next

We want the USB fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit 8aff4ea2 parents e7a2c3f 0238df6314 files · +2759 −1789Browse files

Showing the changes to include/uapi/linux (3 of 314 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
2525 #define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
2626 #define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
2727 #define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
28+#define MFD_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
2829 #define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
30+#define MFD_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
2931 #define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
3032 #define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
3133 #define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
include/uapi/linux/mman.h+2−0
@@ -28,7 +28,9 @@ · 27 unmodified lines
2828 #define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
2929 #define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
3030 #define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
31+#define MAP_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
3132 #define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
33+#define MAP_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
3234 #define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
3335 #define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
3436 #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
6565 #define SHM_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
6666 #define SHM_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
6767 #define SHM_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
68+#define SHM_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
6869 #define SHM_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
70+#define SHM_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
6971 #define SHM_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
7072 #define SHM_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
7173 #define SHM_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB