[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1382527924-12892-1-git-send-email-treding@nvidia.com>
Date: Wed, 23 Oct 2013 13:32:04 +0200
From: Thierry Reding <thierry.reding@...il.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: Jim Davis <jim.epost@...il.com>,
Zoltan Kiss <zoltan.kiss@...rix.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
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@...dia.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 b310810..44af9d8 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 f0d8419..5558706 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) \
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists