Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1821440imm; Mon, 3 Sep 2018 10:18:01 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYEH6WLKbHlYltlsyPBkXYXFmDkCdm9Zab9EI9WChjaJm+K65BNwimw+GW4gf+9v8aeyxmQ X-Received: by 2002:a17:902:22e:: with SMTP id 43-v6mr29791288plc.118.1535995081236; Mon, 03 Sep 2018 10:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535995081; cv=none; d=google.com; s=arc-20160816; b=BnFKxza8vnzEV/PVXu5g5dInYx2Huz22sN3Un/ZqVUrZd1rsCbxgfPs2iPFTXSsrkL UskSBDyYnH0H/jdBNP/nGd6RD1xqkoCuc6nd+6SCy1lAPqZc9S6NLVAjEc53WbZByCak tJ+MvTLMIrDpFBCdPWijyhQgu6/n4p7kQ7+R4zsgEqdhyBU2fYaAOBYSiLI8pEODx1dH yzM2JVTV9MJw4YrfS5K8kgzChYnzGjm4IFfeqsmE2HOQ6OK0yASdFmG/M9incgM7T/Eu qAOmKGJpuGJI1wt2NZalSm59MHnd3/jqJ4tKWGSnujG0zhdZX9jrsc7Ig89M/UrV5lk6 lHOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Pc+W7OESNqS7ITSmcoaXQqDWT3Pamqri0BJ9UzvivZY=; b=1GCWH3WLohLr4sDmFwftz6dlTb0Hb3KcP4SK0mgDMhvpPSCbUNxtUvxpWuHO8dS5r7 dQ7iviBeSIDeEeizvhoMwMgtFdW99dkwldACceBILCVAKUNoKmlcLMvL7IRitAek9UTn O5wgS9eRQ4nI3inykg/06AWcvK9t2CI4ZYn+opMxG9J/WgRLnbv9KTFFEmbMlzaGlkT/ pZaEN+MBceu6alSM5EdsyqNFl3ow0d6D27xapOz00cenvq9W9pP/os27dJdxfczY33cN DDQdUsUKc5iHiMsLxRuyJZIce6pcJgJXCTwi8ldjGU7f6EFRTGU5O8e3sgDPmXcN5s/X thmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 82-v6si18238215pfo.229.2018.09.03.10.17.46; Mon, 03 Sep 2018 10:18:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730009AbeICVhr (ORCPT + 99 others); Mon, 3 Sep 2018 17:37:47 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:42628 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728405AbeICVhq (ORCPT ); Mon, 3 Sep 2018 17:37:46 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3DFF6D09; Mon, 3 Sep 2018 17:16:42 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Artem Bityutskiy , Len Brown , Sasha Levin Subject: [PATCH 4.14 032/165] tools/power turbostat: fix -S on UP systems Date: Mon, 3 Sep 2018 18:55:18 +0200 Message-Id: <20180903165656.700922641@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903165655.003605184@linuxfoundation.org> References: <20180903165655.003605184@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Len Brown [ Upstream commit 9d83601a9cc1884d1b5706ee2acc661d558c6838 ] The -S (system summary) option failed to print any data on a 1-processor system. Reported-by: Artem Bityutskiy Signed-off-by: Len Brown Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/power/x86/turbostat/turbostat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1038,9 +1038,7 @@ void format_all_counters(struct thread_d if (!printed || !summary_only) print_header("\t"); - if (topo.num_cpus > 1) - format_counters(&average.threads, &average.cores, - &average.packages); + format_counters(&average.threads, &average.cores, &average.packages); printed = 1;