tracing: incorrect gfp_t conversion

[linux-2.6-microblaze.git] / include / trace / events / vmscan.h

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index de136db..408c862 100644 (file)
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -96,14 +96,14 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,
                __field(        int,    nid             )
                __field(        int,    zid             )
                __field(        int,    order           )
-               __field(        gfp_t,  gfp_flags       )
+               __field(        unsigned long,  gfp_flags       )
        ),
 
        TP_fast_assign(
                __entry->nid            = nid;
                __entry->zid            = zid;
                __entry->order          = order;
-               __entry->gfp_flags      = gfp_flags;
+               __entry->gfp_flags      = (__force unsigned long)gfp_flags;
        ),
 
        TP_printk("nid=%d order=%d gfp_flags=%s",
@@ -120,12 +120,12 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
 
        TP_STRUCT__entry(
                __field(        int,    order           )
-               __field(        gfp_t,  gfp_flags       )
+               __field(        unsigned long,  gfp_flags       )
        ),
 
        TP_fast_assign(
                __entry->order          = order;
-               __entry->gfp_flags      = gfp_flags;
+               __entry->gfp_flags      = (__force unsigned long)gfp_flags;
        ),
 
        TP_printk("order=%d gfp_flags=%s",
@@ -210,7 +210,7 @@ TRACE_EVENT(mm_shrink_slab_start,
                __field(void *, shrink)
                __field(int, nid)
                __field(long, nr_objects_to_shrink)
-               __field(gfp_t, gfp_flags)
+               __field(unsigned long, gfp_flags)
                __field(unsigned long, cache_items)
                __field(unsigned long long, delta)
                __field(unsigned long, total_scan)
@@ -222,7 +222,7 @@ TRACE_EVENT(mm_shrink_slab_start,
                __entry->shrink = shr->scan_objects;
                __entry->nid = sc->nid;
                __entry->nr_objects_to_shrink = nr_objects_to_shrink;
-               __entry->gfp_flags = sc->gfp_mask;
+               __entry->gfp_flags = (__force unsigned long)sc->gfp_mask;
                __entry->cache_items = cache_items;
                __entry->delta = delta;
                __entry->total_scan = total_scan;
@@ -446,13 +446,13 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,
        TP_STRUCT__entry(
                __field(int, nid)
                __field(int, order)
-               __field(gfp_t, gfp_flags)
+               __field(unsigned long, gfp_flags)
        ),
 
        TP_fast_assign(
                __entry->nid = nid;
                __entry->order = order;
-               __entry->gfp_flags = gfp_flags;
+               __entry->gfp_flags = (__force unsigned long)gfp_flags;
        ),
 
        TP_printk("nid=%d order=%d gfp_flags=%s",