mm: hugetlb: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch b/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch
index 8d7a3fd..2b2b41d 100644
--- a/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch
+++ b/queue/mm-hugetlb-fix-a-race-between-hugetlb-sysctl-handler.patch
@@ -1,4 +1,4 @@
-From 17743798d81238ab13050e8e2833699b54e15467 Mon Sep 17 00:00:00 2001
+From 82e059921afb0c654302e3789ff4af5d19f9ff58 Mon Sep 17 00:00:00 2001
From: Muchun Song <songmuchun@bytedance.com>
Date: Fri, 4 Sep 2020 16:36:13 -0700
Subject: [PATCH] mm/hugetlb: fix a race between hugetlb sysctl handlers
@@ -62,10 +62,10 @@
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 5957dc80ebb1..67fc6383995b 100644
+index acabe9928049..1eedc7003380 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
-@@ -3465,6 +3465,22 @@ static unsigned int allowed_mems_nr(struct hstate *h)
+@@ -3013,6 +3013,22 @@ static unsigned int cpuset_mems_nr(unsigned int *array)
}
#ifdef CONFIG_SYSCTL
@@ -87,8 +87,8 @@
+
static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
struct ctl_table *table, int write,
- void *buffer, size_t *length, loff_t *ppos)
-@@ -3476,9 +3492,8 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+ void __user *buffer, size_t *length, loff_t *ppos)
+@@ -3024,9 +3040,8 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
if (!hugepages_supported())
return -EOPNOTSUPP;
@@ -100,7 +100,7 @@
if (ret)
goto out;
-@@ -3521,9 +3536,8 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -3070,9 +3085,8 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
if (write && hstate_is_gigantic(h))
return -EINVAL;
