From patchwork Fri Sep 26 17:01:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 38013 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E37F1202DB for ; Fri, 26 Sep 2014 17:02:45 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf7493424lbg.9 for ; Fri, 26 Sep 2014 10:02:42 -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 :content-transfer-encoding; bh=l5t2V8sii3l1MJ/vIZ7QEIoS5CPPV3icELsJqlFe4tM=; b=Bz0vJzcjq0jOZVuERQjvTo0yPvCiaNRVBhph50TF1+a9eRI0hJBWfrBO5Lkd5/kGm6 uQ1JX56+ybslx1OxDczSJMKCUp19NgsGoPUC7BzzcXybGQqgug+2mV+mqDwykmyxj/a2 3o6jGARSVLmOqye6FV74cuxXtVaWjkMG6XT7vVMzuquurrQGhzR+C4fBfGgOzeu0r2Vd CBUdp9dkp4uRffR5nX9th1dU1OvymT0pQ51CewV8KKeMo+1yaATsMFPzZWd6z5wzD+YG WmoIPRuCNXH7F2vwM5IvL5EPN8B7tEhS+hXQ+WfF/fp12BBEJKe9ReCCno8na+yRIwzs MWnQ== X-Gm-Message-State: ALoCoQl5wNlHV+F8RyrWqMxrAUL++QBN0sfm2njXT5Clr82bq3l0kdXZLc5jQtpGkgrbr9Ilp4eT X-Received: by 10.112.126.228 with SMTP id nb4mr568642lbb.16.1411750962547; Fri, 26 Sep 2014 10:02:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.138 with SMTP id jo10ls379800lab.56.gmail; Fri, 26 Sep 2014 10:02:42 -0700 (PDT) X-Received: by 10.152.22.137 with SMTP id d9mr21731186laf.29.1411750962347; Fri, 26 Sep 2014 10:02:42 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id d6si8080164lbe.13.2014.09.26.10.02.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Sep 2014 10:02:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so3029487lbi.41 for ; Fri, 26 Sep 2014 10:02:41 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr21395503lac.44.1411750961516; Fri, 26 Sep 2014 10:02:41 -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.130.169 with SMTP id of9csp95684lbb; Fri, 26 Sep 2014 10:02:40 -0700 (PDT) X-Received: by 10.70.129.72 with SMTP id nu8mr43749334pdb.91.1411750960101; Fri, 26 Sep 2014 10:02:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wo10si10156846pab.222.2014.09.26.10.02.38 for ; Fri, 26 Sep 2014 10:02:40 -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 S1755673AbaIZRCf (ORCPT + 27 others); Fri, 26 Sep 2014 13:02:35 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:49874 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755608AbaIZRCd (ORCPT ); Fri, 26 Sep 2014 13:02:33 -0400 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.204]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s8QH1swo000575; Fri, 26 Sep 2014 18:01:54 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 04E181AE036E; Fri, 26 Sep 2014 18:02:02 +0100 (BST) From: Will Deacon To: acme@redhat.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Will Deacon , Jiri Olsa , Jean Pihet Subject: [PATCH] perf tools: fix build breakage on arm and arm64 targets Date: Fri, 26 Sep 2014 18:01:58 +0100 Message-Id: <1411750918-25220-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 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: will.deacon@arm.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.217.182 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: , Attempting to build the perf tool on arm or arm64 targets results in the following failure: arch/arm/util/unwind-libunwind.c: In function ‘libunwind__arch_reg_id’: arch/arm/util/unwind-libunwind.c:43:3: error: implicit declaration of function ‘pr_err’ [-Werror=implicit-function-declaration] pr_err("unwind: invalid reg id %d\n", regnum); ^ This is due to commit 84f5d36f4866 ("perf tools: Move pr_* debug macros into debug object") moving the pr_* macros into a new header file, but failing to update architectures other than x86. This patch adds the missing includes, and fixes the build again. Cc: Jiri Olsa Cc: Jean Pihet Signed-off-by: Will Deacon --- tools/perf/arch/arm/tests/dwarf-unwind.c | 1 + tools/perf/arch/arm/util/unwind-libunwind.c | 1 + tools/perf/arch/arm64/util/unwind-libunwind.c | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/perf/arch/arm/tests/dwarf-unwind.c b/tools/perf/arch/arm/tests/dwarf-unwind.c index 9f870d27cb39..62eff847f91c 100644 --- a/tools/perf/arch/arm/tests/dwarf-unwind.c +++ b/tools/perf/arch/arm/tests/dwarf-unwind.c @@ -3,6 +3,7 @@ #include "thread.h" #include "map.h" #include "event.h" +#include "debug.h" #include "tests/tests.h" #define STACK_SIZE 8192 diff --git a/tools/perf/arch/arm/util/unwind-libunwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c index 729ed69a6664..62c397ed3d97 100644 --- a/tools/perf/arch/arm/util/unwind-libunwind.c +++ b/tools/perf/arch/arm/util/unwind-libunwind.c @@ -3,6 +3,7 @@ #include #include "perf_regs.h" #include "../../util/unwind.h" +#include "../../util/debug.h" int libunwind__arch_reg_id(int regnum) { diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c index 436ee43859dc..a87afa91a99e 100644 --- a/tools/perf/arch/arm64/util/unwind-libunwind.c +++ b/tools/perf/arch/arm64/util/unwind-libunwind.c @@ -3,6 +3,7 @@ #include #include "perf_regs.h" #include "../../util/unwind.h" +#include "../../util/debug.h" int libunwind__arch_reg_id(int regnum) {