The patch titled
Subject: thp-extract-khugepaged-from-mm-huge_memoryc-fix
has been added to the -mm tree. Its filename is
thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: thp-extract-khugepaged-from-mm-huge_memoryc-fix
khugepaged_mutex can be static to mm/huge_memory.c:enabled_store()
Makes me wonder what it actually does...
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Andres Lagar-Cavilla <andreslc@xxxxxxxxxx>
Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Ning Qu <quning@xxxxxxxxx>
Cc: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxx>
Cc: neha agarwal <neha.agbk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/khugepaged.h | 1 -
mm/huge_memory.c | 1 +
mm/khugepaged.c | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
diff -puN include/linux/khugepaged.h~thp-extract-khugepaged-from-mm-huge_memoryc-fix include/linux/khugepaged.h
--- a/include/linux/khugepaged.h~thp-extract-khugepaged-from-mm-huge_memoryc-fix
+++ a/include/linux/khugepaged.h
@@ -4,7 +4,6 @@
#include <linux/sched.h> /* MMF_VM_HUGEPAGE */
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-extern struct mutex khugepaged_mutex;
extern struct attribute_group khugepaged_attr_group;
extern int khugepaged_init(void);
diff -puN mm/huge_memory.c~thp-extract-khugepaged-from-mm-huge_memoryc-fix mm/huge_memory.c
--- a/mm/huge_memory.c~thp-extract-khugepaged-from-mm-huge_memoryc-fix
+++ a/mm/huge_memory.c
@@ -174,6 +174,7 @@ static ssize_t enabled_store(struct kobj
const char *buf, size_t count)
{
ssize_t ret;
+ static DEFINE_MUTEX(khugepaged_mutex);
ret = triple_flag_store(kobj, attr, buf, count,
TRANSPARENT_HUGEPAGE_FLAG,
diff -puN mm/khugepaged.c~thp-extract-khugepaged-from-mm-huge_memoryc-fix mm/khugepaged.c
--- a/mm/khugepaged.c~thp-extract-khugepaged-from-mm-huge_memoryc-fix
+++ a/mm/khugepaged.c
@@ -57,7 +57,6 @@ static unsigned int khugepaged_scan_slee
static unsigned int khugepaged_alloc_sleep_millisecs __read_mostly = 60000;
static unsigned long khugepaged_sleep_expire;
static struct task_struct *khugepaged_thread __read_mostly;
-DEFINE_MUTEX(khugepaged_mutex);
static DEFINE_SPINLOCK(khugepaged_mm_lock);
static DECLARE_WAIT_QUEUE_HEAD(khugepaged_wait);
/*
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
revert-mm-memcontrol-fix-possible-css-ref-leak-on-oom.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-reorganize-slab-freelist-randomization-fix.patch
mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
mm-add-nr_zsmalloc-to-vmstat-fix.patch
mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub-fix.patch
mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub-fix-fix.patch
nvme-dont-allocate-unused-nvme_major-fix.patch
bitmap-bitmap_equal-memcmp-optimization-fix.patch
kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
kexec-allow-architectures-to-override-boot-mapping-fix.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
