From patchwork Tue Sep 30 11:27:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 38134 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 94EAE2032C for ; Tue, 30 Sep 2014 11:27:52 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id cc10sf1197713wib.7 for ; Tue, 30 Sep 2014 04:27:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=7EQmIuNvFpg0VgIEsPNpCOjIWRn/JgC36cS0sgA6Hv4=; b=NFKttyP0M3FRfOop/QUXYq2dgzPH+zsRniIAeYRoOO6Gkyf6XKhrWEsgnlIuAptTKp QUTJ5jUzRhHjWlJt1iO4VLQK22+U9a2chm6LgOERCNVscvUAF1CkdjWEPmCQTamy561e TYCADjwGG/2fCi55AtjFCRsBtRQwIGolc0XiXEHKkJmIW7/uUQH9w8vLOI6PiUlm3Li5 MVW7gEE/LvMUNBj5dxNwMaxcU1tehVoBP/Xjmn+ch8gWZZPmB7vmPpEXZ4IilAKKy1Wx Ayc/nL3NsVI9OqxfLrQJH4ueuwk5w6ZptaM4ZhO4tIa82jIbUkEZrYJhK47/JVvzCrHK wklw== X-Gm-Message-State: ALoCoQk1ZLf2y/evLxj2vWCsIFS4EcKYIEu+YKMVzRQwYMsea8aJKZNQpuxw/fSc0uXLTrINjO+7 X-Received: by 10.194.87.35 with SMTP id u3mr1541487wjz.3.1412076471787; Tue, 30 Sep 2014 04:27:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.169 with SMTP id s9ls27775laa.47.gmail; Tue, 30 Sep 2014 04:27:51 -0700 (PDT) X-Received: by 10.152.29.129 with SMTP id k1mr46882655lah.81.1412076471459; Tue, 30 Sep 2014 04:27:51 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id t6si22319420lat.51.2014.09.30.04.27.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 04:27:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id s18so4454614lam.9 for ; Tue, 30 Sep 2014 04:27:50 -0700 (PDT) X-Received: by 10.152.88.16 with SMTP id bc16mr26697425lab.56.1412076470522; Tue, 30 Sep 2014 04:27:50 -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 of9csp327782lbb; Tue, 30 Sep 2014 04:27:49 -0700 (PDT) X-Received: by 10.70.131.230 with SMTP id op6mr26975045pdb.32.1412076469104; Tue, 30 Sep 2014 04:27:49 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id so6si26645185pac.164.2014.09.30.04.27.48 for ; Tue, 30 Sep 2014 04:27:49 -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 S1751786AbaI3L1q (ORCPT + 27 others); Tue, 30 Sep 2014 07:27:46 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:63705 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196AbaI3L1p (ORCPT ); Tue, 30 Sep 2014 07:27:45 -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 s8UBR7wo002193; Tue, 30 Sep 2014 12:27:07 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 0F3FD1AE08D9; Tue, 30 Sep 2014 12:27:16 +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 v2] perf tools: fix build breakage on arm64 targets Date: Tue, 30 Sep 2014 12:27:12 +0100 Message-Id: <1412076432-22045-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.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.215.50 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 for an arm64 target results in the following failure: arch/arm64/util/unwind-libunwind.c: In function 'libunwind__arch_reg_id': arch/arm64/util/unwind-libunwind.c:77:3: error: implicit declaration of function 'pr_err' pr_err("unwind: invalid reg id %d\n", regnum); ^ arch/arm64/util/unwind-libunwind.c:77:3: error: nested extern declaration of 'pr_err' 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 include, and fixes the build again. Cc: Jiri Olsa Cc: Jean Pihet Signed-off-by: Will Deacon --- v1->v2: Rebased onto tip tree, which removed the need for the arch/arm/ hunks. tools/perf/arch/arm64/util/unwind-libunwind.c | 1 + 1 file changed, 1 insertion(+) 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) {