diff options
author | Thierry Reding <thierry.reding@gmail.com> | 2013-10-23 07:32:04 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-10-24 10:37:06 -0400 |
commit | ce5be5a16359962f78f0203f0ed7ad6d489492ab (patch) | |
tree | a8aa1e7586e50e9901b6ddfc628b4dc962ae0101 | |
parent | 2b2b614dd24e4e6474fcf2dcf69c95c908838959 (diff) |
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>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r-- | drivers/xen/swiotlb-xen.c | 1 | ||||
-rw-r--r-- | lib/swiotlb.c | 1 |
2 files changed, 1 insertions, 1 deletions
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 @@ | |||
43 | #include <xen/xen-ops.h> | 43 | #include <xen/xen-ops.h> |
44 | #include <xen/hvc-console.h> | 44 | #include <xen/hvc-console.h> |
45 | 45 | ||
46 | #define CREATE_TRACE_POINTS | ||
47 | #include <trace/events/swiotlb.h> | 46 | #include <trace/events/swiotlb.h> |
48 | /* | 47 | /* |
49 | * Used to do a quick range check in swiotlb_tbl_unmap_single and | 48 | * 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 @@ | |||
38 | #include <linux/bootmem.h> | 38 | #include <linux/bootmem.h> |
39 | #include <linux/iommu-helper.h> | 39 | #include <linux/iommu-helper.h> |
40 | 40 | ||
41 | #define CREATE_TRACE_POINTS | ||
41 | #include <trace/events/swiotlb.h> | 42 | #include <trace/events/swiotlb.h> |
42 | 43 | ||
43 | #define OFFSET(val,align) ((unsigned long) \ | 44 | #define OFFSET(val,align) ((unsigned long) \ |