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

[linux-2.6-block.git] / include / trace / events / xen.h

diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h
index a7c8b452aab9c7fefaa3908a31d00214b24d5717..b8adf05c534e725d1e0e3b614181b008e2488f65 100644 (file)
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@@ -148,7 +148,6 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte,
                     TP_ARGS(ptep, pteval))
 
 DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte);
-DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic);
 
 TRACE_EVENT(xen_mmu_set_pte_at,
            TP_PROTO(struct mm_struct *mm, unsigned long addr,
@@ -170,21 +169,6 @@ TRACE_EVENT(xen_mmu_set_pte_at,
                      (int)sizeof(pteval_t) * 2, (unsigned long long)__entry->pteval)
        );
 
-TRACE_EVENT(xen_mmu_pte_clear,
-           TP_PROTO(struct mm_struct *mm, unsigned long addr, pte_t *ptep),
-           TP_ARGS(mm, addr, ptep),
-           TP_STRUCT__entry(
-                   __field(struct mm_struct *, mm)
-                   __field(unsigned long, addr)
-                   __field(pte_t *, ptep)
-                   ),
-           TP_fast_assign(__entry->mm = mm;
-                          __entry->addr = addr;
-                          __entry->ptep = ptep),
-           TP_printk("mm %p addr %lx ptep %p",
-                     __entry->mm, __entry->addr, __entry->ptep)
-       );
-
 TRACE_DEFINE_SIZEOF(pmdval_t);
 
 TRACE_EVENT(xen_mmu_set_pmd,
@@ -202,6 +186,24 @@ TRACE_EVENT(xen_mmu_set_pmd,
                      (int)sizeof(pmdval_t) * 2, (unsigned long long)__entry->pmdval)
        );
 
+#ifdef CONFIG_X86_PAE
+DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic);
+
+TRACE_EVENT(xen_mmu_pte_clear,
+           TP_PROTO(struct mm_struct *mm, unsigned long addr, pte_t *ptep),
+           TP_ARGS(mm, addr, ptep),
+           TP_STRUCT__entry(
+                   __field(struct mm_struct *, mm)
+                   __field(unsigned long, addr)
+                   __field(pte_t *, ptep)
+                   ),
+           TP_fast_assign(__entry->mm = mm;
+                          __entry->addr = addr;
+                          __entry->ptep = ptep),
+           TP_printk("mm %p addr %lx ptep %p",
+                     __entry->mm, __entry->addr, __entry->ptep)
+       );
+
 TRACE_EVENT(xen_mmu_pmd_clear,
            TP_PROTO(pmd_t *pmdp),
            TP_ARGS(pmdp),
@@ -211,6 +213,7 @@ TRACE_EVENT(xen_mmu_pmd_clear,
            TP_fast_assign(__entry->pmdp = pmdp),
            TP_printk("pmdp %p", __entry->pmdp)
        );
+#endif
 
 #if CONFIG_PGTABLE_LEVELS >= 4