Merge 4.19-rc7 into char-misc-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 6 insertions, 0 deletions

diff --git a/include/uapi/linux/memfd.h b/include/uapi/linux/memfd.h
index 015a4c0bbb47..7a8a26751c23 100644
--- a/include/uapi/linux/memfd.h
+++ b/include/uapi/linux/memfd.h
@@ -25,7 +25,9 @@
 #define MFD_HUGE_2MB    HUGETLB_FLAG_ENCODE_2MB
 #define MFD_HUGE_8MB    HUGETLB_FLAG_ENCODE_8MB
 #define MFD_HUGE_16MB   HUGETLB_FLAG_ENCODE_16MB
+#define MFD_HUGE_32MB   HUGETLB_FLAG_ENCODE_32MB
 #define MFD_HUGE_256MB  HUGETLB_FLAG_ENCODE_256MB
+#define MFD_HUGE_512MB  HUGETLB_FLAG_ENCODE_512MB
 #define MFD_HUGE_1GB    HUGETLB_FLAG_ENCODE_1GB
 #define MFD_HUGE_2GB    HUGETLB_FLAG_ENCODE_2GB
 #define MFD_HUGE_16GB   HUGETLB_FLAG_ENCODE_16GB
diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h
index bfd5938fede6..d0f515d53299 100644
--- a/include/uapi/linux/mman.h
+++ b/include/uapi/linux/mman.h
@@ -28,7 +28,9 @@
 #define MAP_HUGE_2MB    HUGETLB_FLAG_ENCODE_2MB
 #define MAP_HUGE_8MB    HUGETLB_FLAG_ENCODE_8MB
 #define MAP_HUGE_16MB   HUGETLB_FLAG_ENCODE_16MB
+#define MAP_HUGE_32MB   HUGETLB_FLAG_ENCODE_32MB
 #define MAP_HUGE_256MB  HUGETLB_FLAG_ENCODE_256MB
+#define MAP_HUGE_512MB  HUGETLB_FLAG_ENCODE_512MB
 #define MAP_HUGE_1GB    HUGETLB_FLAG_ENCODE_1GB
 #define MAP_HUGE_2GB    HUGETLB_FLAG_ENCODE_2GB
 #define MAP_HUGE_16GB   HUGETLB_FLAG_ENCODE_16GB
diff --git a/include/uapi/linux/shm.h b/include/uapi/linux/shm.h
index dde1344f047c..6507ad0afc81 100644
--- a/include/uapi/linux/shm.h
+++ b/include/uapi/linux/shm.h
@@ -65,7 +65,9 @@ struct shmid_ds {
 #define SHM_HUGE_2MB    HUGETLB_FLAG_ENCODE_2MB
 #define SHM_HUGE_8MB    HUGETLB_FLAG_ENCODE_8MB
 #define SHM_HUGE_16MB   HUGETLB_FLAG_ENCODE_16MB
+#define SHM_HUGE_32MB   HUGETLB_FLAG_ENCODE_32MB
 #define SHM_HUGE_256MB  HUGETLB_FLAG_ENCODE_256MB
+#define SHM_HUGE_512MB  HUGETLB_FLAG_ENCODE_512MB
 #define SHM_HUGE_1GB    HUGETLB_FLAG_ENCODE_1GB
 #define SHM_HUGE_2GB    HUGETLB_FLAG_ENCODE_2GB
 #define SHM_HUGE_16GB   HUGETLB_FLAG_ENCODE_16GB