From 2843be343a987e264c40c67729c8acf46f19b098 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 23 Oct 2013 13:21:52 +0200
Subject: [PATCH] tracing/events: Fix swiotlb tracepoint creation

Tracepoints are only created when Xen support is enabled, but they are
also referenced within lib/swiotlb.c. So unless Xen support is enabled
the tracepoints will be missing, therefore causing builds to fail. Fix
this by moving the tracepoint creation to lib/swiotlb.c, which works
nicely because the Xen swiotlb support selects the generic swiotlb
support.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/xen/swiotlb-xen.c | 1 -
 lib/swiotlb.c             | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index b31081007a81..44af9d8577de 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -43,7 +43,6 @@
 #include <xen/xen-ops.h>
 #include <xen/hvc-console.h>
 
-#define CREATE_TRACE_POINTS
 #include <trace/events/swiotlb.h>
 /*
  * Used to do a quick range check in swiotlb_tbl_unmap_single and
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index f0d841907da6..55587060e893 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -38,6 +38,7 @@
 #include <linux/bootmem.h>
 #include <linux/iommu-helper.h>
 
+#define CREATE_TRACE_POINTS
 #include <trace/events/swiotlb.h>
 
 #define OFFSET(val,align) ((unsigned long)	\
-- 
2.39.2