The patch titled
Subject: mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix
has been removed from the -mm tree. Its filename was
mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix.patch
This patch was dropped because it was folded into mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix
tweak coding-style, remove pointless __init on inlined function
Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Cc: Jiang Liu <jiang.liu@xxxxxxxxxx>
Cc: Jianguo Wu <wujianguo@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/hugetlb_cgroup.h | 4 +++-
mm/hugetlb_cgroup.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff -puN include/linux/hugetlb_cgroup.h~mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix include/linux/hugetlb_cgroup.h
--- a/include/linux/hugetlb_cgroup.h~mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix
+++ a/include/linux/hugetlb_cgroup.h
@@ -111,7 +111,9 @@ hugetlb_cgroup_uncharge_cgroup(int idx,
return;
}
-static inline void __init hugetlb_cgroup_file_init() {}
+static inline void hugetlb_cgroup_file_init()
+{
+}
static inline void hugetlb_cgroup_migrate(struct page *oldhpage,
struct page *newhpage)
diff -puN mm/hugetlb_cgroup.c~mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix mm/hugetlb_cgroup.c
--- a/mm/hugetlb_cgroup.c~mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix
+++ a/mm/hugetlb_cgroup.c
@@ -382,7 +382,7 @@ void __init hugetlb_cgroup_file_init()
{
struct hstate *h;
- for_each_hstate(h)
+ for_each_hstate(h) {
/*
* Add cgroup control files only if the huge page consists
* of more than two normal pages. This is because we use
@@ -390,6 +390,7 @@ void __init hugetlb_cgroup_file_init()
*/
if (huge_page_order(h) >= HUGETLB_CGROUP_MIN_ORDER)
__hugetlb_cgroup_file_init(hstate_index(h));
+ }
}
/*
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch
irq-tsk-comm-is-an-array.patch
memory-hotplug-document-and-enable-config_movable_node.patch
memcg-kmem-accounting-basic-infrastructure.patch
slub-slub-specific-propagation-changes.patch
mm-mprotectc-coding-style-cleanups.patch
mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init.patch
mm-hugetlb-create-hugetlb-cgroup-file-in-hugetlb_init-fix-2.patch
mm-avoid-possible-deadlock-caused-by-too_many_isolated-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
