From patchwork Sat Apr 5 14:25:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Salter X-Patchwork-Id: 27879 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 00CFE20490 for ; Sat, 5 Apr 2014 14:26:54 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf9014582ykr.2 for ; Sat, 05 Apr 2014 07:26:54 -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=9PwRHPzw/2SD/hFJN2jBg/3fjSR6QzhZD7wrklog0Hg=; b=bzB3hEld0iiM8K9tHSicx+qlNQbal7WHZSVBPgvSv/5gNsI9Xa+TpPYoxl7+VUKTyY jpZCUGlxkq3ti8hfg85JDIlaoXjOyN5VIudD/aWw1ZKd8t5DcbNTJlFFDu/OQzzw/aXR hUHfdale8aEV7TN1L2101q93Px6UxUIopkn8YHc+gTo8NLyvZPJB3FLsQfWRWv9kXwJ+ 2gG9Md6EMXmN7CPS6P9+6fiyvv2moBIA8egh9Zql6Cl/9E3+9fu1Wm0fSEuScgmRx+lp djGy92myhdXIa5WgwtOO0yx9cIoovEwnqkT7h3Si1hLw1sA2qUEQP69Ka2MrEUiM47GX yzcw== X-Gm-Message-State: ALoCoQntGBZzSctC3SpkcwhPCCx1lsgw0wYoW2Xb4SAjkYkGnZEiYBic24++cKcifpMx89x0pmgO X-Received: by 10.236.199.108 with SMTP id w72mr4313942yhn.10.1396708014668; Sat, 05 Apr 2014 07:26:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.131 with SMTP id l3ls1363248qgf.40.gmail; Sat, 05 Apr 2014 07:26:54 -0700 (PDT) X-Received: by 10.52.128.231 with SMTP id nr7mr2078898vdb.17.1396708014508; Sat, 05 Apr 2014 07:26:54 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id lz6si2181144vcb.139.2014.04.05.07.26.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 05 Apr 2014 07:26:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so2333307veb.37 for ; Sat, 05 Apr 2014 07:26:54 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr64661vdx.28.1396708014332; Sat, 05 Apr 2014 07:26:54 -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.220.12.8 with SMTP id v8csp28623vcv; Sat, 5 Apr 2014 07:26:53 -0700 (PDT) X-Received: by 10.67.14.98 with SMTP id ff2mr20835109pad.101.1396708013486; Sat, 05 Apr 2014 07:26:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xt7si5949502pab.102.2014.04.05.07.26.49; Sat, 05 Apr 2014 07:26:49 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753004AbaDEO0l (ORCPT + 27 others); Sat, 5 Apr 2014 10:26:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14214 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbaDEO0k (ORCPT ); Sat, 5 Apr 2014 10:26:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s35EQB7n006885 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 5 Apr 2014 10:26:11 -0400 Received: from deneb.redhat.com (ovpn-113-51.phx2.redhat.com [10.3.113.51]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s35EQAU0025961; Sat, 5 Apr 2014 10:26:10 -0400 From: Mark Salter To: Catalin Marinas Cc: Jean Pihet , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Salter Subject: [PATCH] arm64: fix !CONFIG_COMPAT build failures Date: Sat, 5 Apr 2014 10:25:49 -0400 Message-Id: <1396707949-397-1-git-send-email-msalter@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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: msalter@redhat.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Recent arm64 builds using CONFIG_ARM64_64K_PAGES are failing with: arch/arm64/kernel/perf_regs.c: In function ‘perf_reg_abi’: arch/arm64/kernel/perf_regs.c:41:2: error: implicit declaration of function ‘is_compat_thread’ arch/arm64/kernel/perf_event.c:1398:2: error: unknown type name ‘compat_uptr_t’ This is due to some recent arm64 perf commits with compat support: commit 23c7d70d55c6d9: ARM64: perf: add support for frame pointer unwinding in compat mode commit 2ee0d7fd36a3f8: ARM64: perf: add support for perf registers API Those patches make the arm64 kernel unbuildable if CONFIG_COMPAT is not defined and CONFIG_ARM64_64K_PAGES depends on !CONFIG_COMPAT. This patch allows the arm64 kernel to build with and without CONFIG_COMPAT. Signed-off-by: Mark Salter --- arch/arm64/kernel/perf_event.c | 4 ++++ arch/arm64/kernel/perf_regs.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index e868c72..baf5afb 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1386,6 +1386,7 @@ user_backtrace(struct frame_tail __user *tail, return buftail.fp; } +#ifdef CONFIG_COMPAT /* * The registers we're interested in are at the end of the variable * length saved register structure. The fp points at the end of this @@ -1430,6 +1431,7 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, return (struct compat_frame_tail __user *)compat_ptr(buftail.fp) - 1; } +#endif /* CONFIG_COMPAT */ void perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) @@ -1451,6 +1453,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, tail && !((unsigned long)tail & 0xf)) tail = user_backtrace(tail, entry); } else { +#ifdef CONFIG_COMPAT /* AARCH32 compat mode */ struct compat_frame_tail __user *tail; @@ -1459,6 +1462,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, while ((entry->nr < PERF_MAX_STACK_DEPTH) && tail && !((unsigned long)tail & 0x3)) tail = compat_user_backtrace(tail, entry); +#endif } } diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c index f2d6f0a..422ebd6 100644 --- a/arch/arm64/kernel/perf_regs.c +++ b/arch/arm64/kernel/perf_regs.c @@ -2,6 +2,8 @@ #include #include #include + +#include #include #include