From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.6 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_PASS,URIBL_BLOCKED,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 541FFC43387 for ; Mon, 7 Jan 2019 12:38:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BD1420859 for ; Mon, 7 Jan 2019 12:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546864698; bh=5246R1KAOd5CX6XXvvNS4B4D5t9NqxaAx4b0jshq3nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hMPeP/CKZcVGJsr74nmdJU/jThVijqDH8Osh5e/CbsMHkeURPKpp2VxMQ7XhBvKL/ vMYbmi/vDZAWfQUCkA2LWmo0HBMxqU9Rl6aw3IxMfiRKb7OSmh0A+GOiPQRatPwtKM sWVNXgYYsUtOzXKUAsOGM5g5ylIxEc4GhOWQ3MYQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727388AbfAGMiR (ORCPT ); Mon, 7 Jan 2019 07:38:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:53336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727460AbfAGMiO (ORCPT ); Mon, 7 Jan 2019 07:38:14 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 BCE2C206BB; Mon, 7 Jan 2019 12:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546864693; bh=5246R1KAOd5CX6XXvvNS4B4D5t9NqxaAx4b0jshq3nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKv+qzCXO4On5jO9SHc+O5i0Zp3ofGqDw7WbXCzQ3ZOSPGUIqQHMvCfq54S8wFPO+ OVckYDP20DM3PlYAs1zAlesRykM2ngZGsr7/REzrWIupDJjbjjoB3PLPuusItyXBJh b/b5dyXTeH8su5j/IqpN0oixWs5N+ylp/LrZ5idw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Andi Kleen , David Ahern , "David S. Miller" , Jiri Olsa , Leo Yan , Mathieu Poirier , Namhyung Kim , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 4.20 069/145] perf env: Also consider env->arch == NULL as local operation Date: Mon, 7 Jan 2019 13:31:46 +0100 Message-Id: <20190107104446.280558460@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104437.308206189@linuxfoundation.org> References: <20190107104437.308206189@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo commit 804234f27180dcf9a25cb98a88d5212f65b7f3fd upstream. We'll set a new machine field based on env->arch, which for live mode, like with 'perf top' means we need to use uname() to figure the name of the arch, fix perf_env__arch() to consider both (env == NULL) and (env->arch == NULL) as local operation. Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: David S. Miller Cc: Jiri Olsa Cc: Leo Yan Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Wang Nan Cc: stable@vger.kernel.org # 4.19 Link: https://lkml.kernel.org/n/tip-vcz4ufzdon7cwy8dm2ua53xk@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -166,7 +166,7 @@ const char *perf_env__arch(struct perf_e struct utsname uts; char *arch_name; - if (!env) { /* Assume local operation */ + if (!env || !env->arch) { /* Assume local operation */ if (uname(&uts) < 0) return NULL; arch_name = uts.machine;