diff options
author | Li Hong <lihong.hi@gmail.com> | 2010-03-05 16:41:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:24 -0500 |
commit | c475dab63ae798d81fb597a6a1859986b296d9d0 (patch) | |
tree | f2c18302f0fa261b0e82b4bf91bce48fe96209fb /mm | |
parent | f650316c8b80fe61a31b8b575405b37cbf170459 (diff) |
mm/page_alloc.c: adjust a call site to trace_mm_page_free_direct
Move a call of trace_mm_page_free_direct() from free_hot_page() to
free_hot_cold_page(). It is clearer and close to kmemcheck_free_shadow(),
as it is done in function __free_pages_ok().
Signed-off-by: Li Hong <lihong.hi@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik van Riel <riel@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Li Ming Chun <macli@brc.ubc.ca>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ee37091b191b..caa7df60a4a1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1083,6 +1083,7 @@ static void free_hot_cold_page(struct page *page, int cold) | |||
1083 | int migratetype; | 1083 | int migratetype; |
1084 | int wasMlocked = __TestClearPageMlocked(page); | 1084 | int wasMlocked = __TestClearPageMlocked(page); |
1085 | 1085 | ||
1086 | trace_mm_page_free_direct(page, 0); | ||
1086 | kmemcheck_free_shadow(page, 0); | 1087 | kmemcheck_free_shadow(page, 0); |
1087 | 1088 | ||
1088 | if (PageAnon(page)) | 1089 | if (PageAnon(page)) |
@@ -1136,7 +1137,6 @@ out: | |||
1136 | 1137 | ||
1137 | void free_hot_page(struct page *page) | 1138 | void free_hot_page(struct page *page) |
1138 | { | 1139 | { |
1139 | trace_mm_page_free_direct(page, 0); | ||
1140 | free_hot_cold_page(page, 0); | 1140 | free_hot_cold_page(page, 0); |
1141 | } | 1141 | } |
1142 | 1142 | ||