From patchwork Wed Oct 15 03:28:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 38765 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A0A4720549 for ; Wed, 15 Oct 2014 03:30:26 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id b6sf179295lbj.3 for ; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=/5WcUHoq+yGtH67swjdch7owBeH44SSXb+b9HmTlXB0=; b=JksXKhPI3mS03PqAiuQcgNPQv6J5yT3TnqDjobf3epLpWJ/lpz/+rlzeEQZX57Aa8F 1tVb0dLJmWdcbwQgKAJb9ETrJHMZv30Y9++sH/0GJLQ/pMKSbFSI1JGKor5nDBFkgiW2 XVp1FPnSPyRMMC03ChAZQgwTagceaPgL+8nBK2G54mMPwpUHfHxQcX4A7BkSAtmLFOg+ Ma9Zt25bbrSRgjVIqw+0nfr2PtjpYFADsl4Gf/HSpNQDKj6qMveMoNpRuVRj2jxSH9v3 GCerLDxDORg5AYD3xXIHBsE/s9Y4mYZVCpKQn0J4GJtVClkpDaQM9pbUh9dLx6WO5M81 y5sA== X-Gm-Message-State: ALoCoQmuq8e+Er8aUaz5093191LO7OVaplw0Y+x8CuDgya3sH3dsOLhpYqMtLROHycW+jTNluRAw X-Received: by 10.181.27.135 with SMTP id jg7mr1621641wid.5.1413343825460; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.133 with SMTP id m5ls9973laf.102.gmail; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) X-Received: by 10.112.166.130 with SMTP id zg2mr9325853lbb.3.1413343825179; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id t10si28743119lat.82.2014.10.14.20.30.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 20:30:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gq15so284865lab.40 for ; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) X-Received: by 10.112.147.199 with SMTP id tm7mr83133lbb.92.1413343825089; Tue, 14 Oct 2014 20:30:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp522485lbz; Tue, 14 Oct 2014 20:30:24 -0700 (PDT) X-Received: by 10.66.150.102 with SMTP id uh6mr6487463pab.141.1413343823136; Tue, 14 Oct 2014 20:30:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h1si13711112pdm.11.2014.10.14.20.30.21 for ; Tue, 14 Oct 2014 20:30:23 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932669AbaJODaT (ORCPT + 27 others); Tue, 14 Oct 2014 23:30:19 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:34523 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755643AbaJODaS (ORCPT ); Tue, 14 Oct 2014 23:30:18 -0400 Received: from 172.24.2.119 (EHLO lggeml422-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AVO71684; Wed, 15 Oct 2014 11:30:13 +0800 (CST) Received: from kernel-host.huawei (10.107.197.247) by lggeml422-hub.china.huawei.com (10.72.61.32) with Microsoft SMTP Server id 14.3.158.1; Wed, 15 Oct 2014 11:30:02 +0800 From: Wang Nan To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo CC: , , , Subject: [PATCH] perf tools: fix incorrect header string Date: Wed, 15 Oct 2014 11:28:53 +0800 Message-ID: <1413343733-7973-1-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 MIME-Version: 1.0 X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020209.543DEA47.016B, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 07fc0b3cf2c96426d9dd023fbf0869a9 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit fbe96f29 (perf tools: Make perf.data more self-descriptive) read '/proc/cpuinfo' to form cpu descriptor. For ARM, it finds 'Processor' field. It is correct when the patch merged, but due to commit b4b8f770 (ARM: kernel: update cpuinfo to print all online CPUs features), the corresponding information becomes 'model name' field. This patch simply corrects it. Signed-off-by: Wang Nan --- tools/perf/perf-sys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 937e432..4293970 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -113,7 +113,7 @@ #define mb() ((void(*)(void))0xffff0fa0)() #define wmb() ((void(*)(void))0xffff0fa0)() #define rmb() ((void(*)(void))0xffff0fa0)() -#define CPUINFO_PROC "Processor" +#define CPUINFO_PROC "model name" #endif #ifdef __aarch64__