From patchwork Tue Mar 3 17:43:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 230028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E26EC3F2D7 for ; Tue, 3 Mar 2020 17:51:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D8AE206E6 for ; Tue, 3 Mar 2020 17:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257862; bh=tCTuDfKPPmcVCVvBzYFAN8oMQCdtn+euLHGRYEqWOaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=07QmfwUl8LB9FFiubaR/F7d7RLriqOb8/RYlfeYpb9ZRIed2VV+I6ZzTLitB+JhzT xSXYcYtJT7prSL0u/jnw22TW1Y1gzsS3Z5ivMghF5pHXKh3lgcdyxknAKtbcueUO2J F/MUHvH1mIkF1N50pA2CSOnSmT+zAiKcASUnPvBE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731609AbgCCRux (ORCPT ); Tue, 3 Mar 2020 12:50:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:58744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731240AbgCCRux (ORCPT ); Tue, 3 Mar 2020 12:50:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D74F7206E6; Tue, 3 Mar 2020 17:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257852; bh=tCTuDfKPPmcVCVvBzYFAN8oMQCdtn+euLHGRYEqWOaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LzhoMEs3kEijyUJo3mpYsh/stdr+oDlU0DhrcNeb5X0hQ4DZ6jJXFu19Fb6ccsS/2 zW5OZ8/YidJJHKaApjHJFXxqVNpCyNv/gEyMaLF8FZ8xS2rxrQXev3dIGkfEVVDQrp R7mFt8+5jpQM+Y8zAZmLQXihYnjtvxLGD+QO2YNI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Olsa , Adrian Hunter , Namhyung Kim , Arnaldo Carvalho de Melo Subject: [PATCH 5.5 153/176] perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc Date: Tue, 3 Mar 2020 18:43:37 +0100 Message-Id: <20200303174322.265649176@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnaldo Carvalho de Melo commit 3f7774033e6820d25beee5cf7aefa11d4968b951 upstream. We need to set actions->ms.map since 599a2f38a989 ("perf hists browser: Check sort keys before hot key actions"), as in that patch we bail out if map is NULL. Reviewed-by: Jiri Olsa Cc: Adrian Hunter Cc: Namhyung Kim Fixes: 599a2f38a989 ("perf hists browser: Check sort keys before hot key actions") Link: https://lkml.kernel.org/n/tip-wp1ssoewy6zihwwexqpohv0j@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/ui/browsers/hists.c | 1 + 1 file changed, 1 insertion(+) --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -3062,6 +3062,7 @@ static int perf_evsel__hists_browse(stru continue; } + actions->ms.map = map; top = pstack__peek(browser->pstack); if (top == &browser->hists->dso_filter) { /*