Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[cascardo/linux.git] / include / trace / events / kmem.h

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index ca72173..6b2e154 100644 (file)
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -140,42 +140,19 @@ DEFINE_EVENT(kmem_free, kfree,
        TP_ARGS(call_site, ptr)
 );
 
-DEFINE_EVENT_CONDITION(kmem_free, kmem_cache_free,
+DEFINE_EVENT(kmem_free, kmem_cache_free,
 
        TP_PROTO(unsigned long call_site, const void *ptr),
 
-       TP_ARGS(call_site, ptr),
-
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id()))
+       TP_ARGS(call_site, ptr)
 );
 
-TRACE_EVENT_CONDITION(mm_page_free,
+TRACE_EVENT(mm_page_free,
 
        TP_PROTO(struct page *page, unsigned int order),
 
        TP_ARGS(page, order),
 
-
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id())),
-
        TP_STRUCT__entry(
                __field(        unsigned long,  pfn             )
                __field(        unsigned int,   order           )
@@ -276,23 +253,12 @@ DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked,
        TP_ARGS(page, order, migratetype)
 );
 
-TRACE_EVENT_CONDITION(mm_page_pcpu_drain,
+TRACE_EVENT(mm_page_pcpu_drain,
 
        TP_PROTO(struct page *page, unsigned int order, int migratetype),
 
        TP_ARGS(page, order, migratetype),
 
-       /*
-        * This trace can be potentially called from an offlined cpu.
-        * Since trace points use RCU and RCU should not be used from
-        * offline cpus, filter such calls out.
-        * While this trace can be called from a preemptable section,
-        * it has no impact on the condition since tasks can migrate
-        * only from online cpus to other online cpus. Thus its safe
-        * to use raw_smp_processor_id.
-        */
-       TP_CONDITION(cpu_online(raw_smp_processor_id())),
-
        TP_STRUCT__entry(
                __field(        unsigned long,  pfn             )
                __field(        unsigned int,   order           )