mm: remove khugepaged double thp vmstat update with CONFIG_NUMA=n

* mm: remove khugepaged double thp vmstat update with CONFIG_NUMA=n
@ 2011-05-26 22:22 Andrea Arcangeli
  2011-05-26 23:30 ` Rik van Riel
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Andrea Arcangeli @ 2011-05-26 22:22 UTC (permalink / raw)
  To: Johannes Weiner; +Cc: linux-mm, Andrew Morton, Andi Kleen, Rik van Riel

Subject: mm: remove khugepaged double thp vmstat update with CONFIG_NUMA=n

From: Andrea Arcangeli <aarcange@redhat.com>

Johannes noticed the vmstat update is already taken care of by
khugepaged_alloc_hugepage() internally. The only places that are
required to update the vmstat are the callers of alloc_hugepage
(callers of khugepaged_alloc_hugepage aren't).

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Reported-by: Johannes Weiner <jweiner@redhat.com>
---
 mm/huge_memory.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2233,11 +2233,8 @@ static void khugepaged_loop(void)
 	while (likely(khugepaged_enabled())) {
 #ifndef CONFIG_NUMA
 		hpage = khugepaged_alloc_hugepage();
-		if (unlikely(!hpage)) {
-			count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
+		if (unlikely(!hpage))
 			break;
-		}
-		count_vm_event(THP_COLLAPSE_ALLOC);
 #else
 		if (IS_ERR(hpage)) {
 			khugepaged_alloc_sleep();

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 4+ messages in thread