Re: Incomplete cherry-pick on linux-3.3.y branch

[Greg KH]

 On Mon, Apr 23, 2012 at 12:08:13PM -0700, H.J. Lu wrote:
> Hi,
> 
> This cherry-pick commit:
> 
> http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=1cb41fe7e34a43a1d27dfdb6d65699786dd44c20
> 
> doesn't work on 3.3 branch since it misses other commits
> required.  On 3.3 branch, there are
> 
> struct hist_entry *__hists__add_entry(struct hists *hists,
>                                       struct addr_location *al,
>                                       struct symbol *sym_parent, u64 period)
> {
>         struct rb_node **p;
>         struct rb_node *parent = NULL;
>         struct hist_entry *he;
>         struct hist_entry entry = {
>                 .thread = al->thread,
> 
> It doesn't work with
> 
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index e11e482..a47a6f1 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -230,6 +230,18 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
>  		if (!cmp) {
>  			he->period += period;
>  			++he->nr_events;
> +
> +			/* If the map of an existing hist_entry has
> +			 * become out-of-date due to an exec() or
> +			 * similar, update it.  Otherwise we will
> +			 * mis-adjust symbol addresses when computing
> +			 * the history counter to increment.
> +			 */
> +			if (he->ms.map != entry->ms.map) {
> +				he->ms.map = entry->ms.map;
> +				if (he->ms.map)
> +					he->ms.map->referenced = true;
> +			}
>  			goto out;
>  		}
> 
> since entry isn't a pointer on 3.3 branch.

Already fixed in the stable-queue tree, and will show up in the next
kernel release.  If you need a fix now, use the one below.

thanks,

greg k-h