Messages in this thread Patch in this message | | | Date | Mon, 13 Aug 2012 19:15:11 +0800 | From | Xiao Guangrong <> | Subject | [PATCH 06/12] 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> --- mm/huge_memory.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 86f71af..5f620cf 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2321,11 +2321,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(); @@ -2339,10 +2336,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(); } -- 1.7.7.6
| |