diff options
author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2012-01-10 18:07:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:30:41 -0500 |
commit | b413d48aa70605701c0b395b2e350ca15f5d643a (patch) | |
tree | 6aa777c589eedfb9dc498f375d553e561e203506 /mm/page_alloc.c | |
parent | da066ad3570b88e7dee82e76a06ee9a7adffcf0d (diff) |
mm-tracepoint: rename page-free events
Rename mm_page_free_direct into mm_page_free and mm_pagevec_free into
mm_page_free_batched
Since v2.6.33-5426-gc475dab the kernel triggers mm_page_free_direct for
all freed pages, not only for directly freed. So, let's name it properly.
For pages freed via page-list we also trigger mm_page_free_batched event.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6c77efbca5bc..516ab623d773 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -632,7 +632,7 @@ static bool free_pages_prepare(struct page *page, unsigned int order) | |||
632 | int i; | 632 | int i; |
633 | int bad = 0; | 633 | int bad = 0; |
634 | 634 | ||
635 | trace_mm_page_free_direct(page, order); | 635 | trace_mm_page_free(page, order); |
636 | kmemcheck_free_shadow(page, order); | 636 | kmemcheck_free_shadow(page, order); |
637 | 637 | ||
638 | if (PageAnon(page)) | 638 | if (PageAnon(page)) |
@@ -1196,7 +1196,7 @@ void free_hot_cold_page_list(struct list_head *list, int cold) | |||
1196 | struct page *page, *next; | 1196 | struct page *page, *next; |
1197 | 1197 | ||
1198 | list_for_each_entry_safe(page, next, list, lru) { | 1198 | list_for_each_entry_safe(page, next, list, lru) { |
1199 | trace_mm_pagevec_free(page, cold); | 1199 | trace_mm_page_free_batched(page, cold); |
1200 | free_hot_cold_page(page, cold); | 1200 | free_hot_cold_page(page, cold); |
1201 | } | 1201 | } |
1202 | } | 1202 | } |