From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Jim Davis <jim.epost@gmail.com>,
Zoltan Kiss <zoltan.kiss@citrix.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tracing/events: Fix swiotlb tracepoint creation
Date: Wed, 23 Oct 2013 09:41:38 -0400 [thread overview]
Message-ID: <20131023134138.GA27771@phenom.dumpdata.com> (raw)
In-Reply-To: <1382527924-12892-1-git-send-email-treding@nvidia.com>
On Wed, Oct 23, 2013 at 01:32:04PM +0200, Thierry Reding wrote:
> 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.
Sweet. Thanks!
>
> 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 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
>
prev parent reply other threads:[~2013-10-23 13:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 17:52 randconfig build error with next-20131022, in lib Jim Davis
2013-10-22 18:06 ` Konrad Rzeszutek Wilk
2013-10-23 11:32 ` [PATCH] tracing/events: Fix swiotlb tracepoint creation Thierry Reding
2013-10-23 13:41 ` Konrad Rzeszutek Wilk [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131023134138.GA27771@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=jim.epost@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=zoltan.kiss@citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).