* [merged] thp-remove-some-code-depend-on-config_numa.patch removed from -mm tree
@ 2012-10-09 18:07 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2012-10-09 18:07 UTC (permalink / raw)
To: xiaoguangrong, aarcange, hughd, rientjes, mm-commits
The patch titled
Subject: thp: remove some code depend on CONFIG_NUMA
has been removed from the -mm tree. Its filename was
thp-remove-some-code-depend-on-config_numa.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Subject: thp: remove some code depend on CONFIG_NUMA
If NUMA is disabled, hpage is used as page pre-alloc, so there are two
cases for hpage:
- it is !NULL, means the page is not consumed otherwise,
- the page has been consumed
If NUMA is enabled, hpage is just used as alloc-fail indicator which is
not a real page, NULL means not fail triggered.
So, we can release the page only if !IS_ERR_OR_NULL
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/huge_memory.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff -puN mm/huge_memory.c~thp-remove-some-code-depend-on-config_numa mm/huge_memory.c
--- a/mm/huge_memory.c~thp-remove-some-code-depend-on-config_numa
+++ a/mm/huge_memory.c
@@ -2306,11 +2306,8 @@ static void khugepaged_wait_work(void)
static void khugepaged_loop(void)
{
- struct page *hpage;
+ struct page *hpage = NULL;
-#ifdef CONFIG_NUMA
- hpage = NULL;
-#endif
while (likely(khugepaged_enabled())) {
#ifndef CONFIG_NUMA
hpage = khugepaged_alloc_hugepage();
@@ -2324,10 +2321,9 @@ static void khugepaged_loop(void)
#endif
khugepaged_do_scan(&hpage);
-#ifndef CONFIG_NUMA
- if (hpage)
+
+ if (!IS_ERR_OR_NULL(hpage))
put_page(hpage);
-#endif
khugepaged_wait_work();
}
_
Patches currently in -mm which might be from xiaoguangrong@linux.vnet.ibm.com are
origin.patch
linux-next.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-09 18:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-09 18:07 [merged] thp-remove-some-code-depend-on-config_numa.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.