From db034083a9a78da45d117ab0d221044b45ad5880 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Thu, 20 Sep 2012 14:04:47 +0800 Subject: [PATCH] --- yaml --- r: 323049 b: refs/heads/master c: 85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa h: refs/heads/master i: 323047: 1896611f34db7159fe00a0b03efc4c96ddbb1ec2 v: v3 --- [refs] | 2 +- trunk/include/trace/events/kmem.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 010bf72bfef6..19af6f3de135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20a36e39d59757252edbbdcf9574ae2998733ce9 +refs/heads/master: 85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa diff --git a/trunk/include/trace/events/kmem.h b/trunk/include/trace/events/kmem.h index 5f889f16b0c8..08fa27244da7 100644 --- a/trunk/include/trace/events/kmem.h +++ b/trunk/include/trace/events/kmem.h @@ -214,7 +214,7 @@ TRACE_EVENT(mm_page_alloc, TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s", __entry->page, - page_to_pfn(__entry->page), + __entry->page ? page_to_pfn(__entry->page) : 0, __entry->order, __entry->migratetype, show_gfp_flags(__entry->gfp_flags)) @@ -240,7 +240,7 @@ DECLARE_EVENT_CLASS(mm_page, TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d", __entry->page, - page_to_pfn(__entry->page), + __entry->page ? page_to_pfn(__entry->page) : 0, __entry->order, __entry->migratetype, __entry->order == 0)