Commit 85f2a2ef authored by Wen Congyang's avatar Wen Congyang Committed by Steven Rostedt

tracing: Don't call page_to_pfn() if page is NULL

When allocating memory fails, page is NULL. page_to_pfn() will
cause the kernel panicked if we don't use sparsemem vmemmap.

Link: http://lkml.kernel.org/r/505AB1FF.8020104@cn.fujitsu.com

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 20a36e39
...@@ -214,7 +214,7 @@ TRACE_EVENT(mm_page_alloc, ...@@ -214,7 +214,7 @@ TRACE_EVENT(mm_page_alloc,
TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s", TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
__entry->page, __entry->page,
page_to_pfn(__entry->page), __entry->page ? page_to_pfn(__entry->page) : 0,
__entry->order, __entry->order,
__entry->migratetype, __entry->migratetype,
show_gfp_flags(__entry->gfp_flags)) show_gfp_flags(__entry->gfp_flags))
...@@ -240,7 +240,7 @@ DECLARE_EVENT_CLASS(mm_page, ...@@ -240,7 +240,7 @@ DECLARE_EVENT_CLASS(mm_page,
TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d", TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
__entry->page, __entry->page,
page_to_pfn(__entry->page), __entry->page ? page_to_pfn(__entry->page) : 0,
__entry->order, __entry->order,
__entry->migratetype, __entry->migratetype,
__entry->order == 0) __entry->order == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment