From: William Cohen <wcohen@redhat.com>
To: wenji.huang@oracle.com
Cc: systemTAP <systemtap@sources.redhat.com>
Subject: Re: [PATCH] Fix the conflicted for_each_cpu macro with 2.6.28-rc4
Date: Mon, 17 Nov 2008 15:56:00 -0000 [thread overview]
Message-ID: <492193FC.7060300@redhat.com> (raw)
In-Reply-To: <491D23A0.8090903@oracle.com>
Wenji Huang wrote:
> This patch will change for_each_cpu macro definition to avoid
> name collusion in 2.6.28-rc4. See mainline commit:
> cb56d98e2a7530615899597551db685d68a2e852.
>
> ---
> runtime/counter.c | 4 ++--
> runtime/map-stat.c | 4 ++--
> runtime/map.c | 14 +++++++-------
> runtime/pmap-gen.c | 6 +++---
> runtime/runtime.h | 10 ++++++++--
> runtime/stat.c | 6 +++---
> runtime/transport/procfs.c | 6 +++---
> 7 files changed, 28 insertions(+), 22 deletions(-)
> --- a/runtime/runtime.h
> +++ b/runtime/runtime.h
> @@ -39,8 +39,14 @@
> #define STP_OLD_TRANSPORT
> #endif
>
> -#ifndef for_each_cpu
> -#define for_each_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map)
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
> +#ifndef stp_for_each_cpu
> +#define stp_for_each_cpu(cpu) for_each_cpu((cpu), cpu_possible_map)
> +#endif
> +#else
> +#ifndef stp_for_each_cpu
> +#define stp_for_each_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map)
> +#endif
> #endif
I noticed this problem occurring with the i686 testing of the new systemtap rpm
on f10. Looking through the git tree for the kernel I found when the change was
checked in:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d
It looks like this is older than a 2.6.28 change, May 9, 2008. This will also be
in 2.6.27 kernels.
-Will
next prev parent reply other threads:[~2008-11-17 15:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-14 7:13 Wenji Huang
2008-11-17 15:56 ` William Cohen [this message]
2008-11-18 1:56 ` Wenji Huang
2008-11-18 4:39 ` Srikar Dronamraju
2008-11-18 5:13 ` Wenji Huang
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=492193FC.7060300@redhat.com \
--to=wcohen@redhat.com \
--cc=systemtap@sources.redhat.com \
--cc=wenji.huang@oracle.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 read-only IMAP folder(s) and NNTP newsgroup(s).