From patchwork Sat May 24 07:02:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 30875 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7463C2066E for ; Sat, 24 May 2014 07:04:56 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id id10sf11814821vcb.0 for ; Sat, 24 May 2014 00:04:56 -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:subject:date:message-id :in-reply-to:references:to:to:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=RdGqRenMYPbNX/zvD22ds+c0KBMic+DlJ7Wg/9P5lZ0=; b=LI2Dl2HYuWTBDLDlXh/VmBTc6QanfYiHpT2UJVzfsS/OTBSdWG5EFWxdE5g39C0U25 l1TQgwNny+g0X/RNsqKoxoW7WIjzqtfvpq8Jr0mlAtuWenAEKILnAV4lPF+dFwNnHTrv UGr/Zvx2eNcNo4AZtU9GWErXbNpMoJ6TxVGDT2LY3ZxlNcrVHJoE/hvPtY7+igzQkFIi a7QkevYVh/6jVK881Bw9EDoYm+Chvb4Unlo+IaGHEyapoI737df+E69eItnChT9adFlA Sl52BEuBma2SanASc5qkTUDIGBfy7qj8B0tRgiIDTdYsIaGveysBqyqY0ibHouguEGWY ZDjA== X-Gm-Message-State: ALoCoQkLyah37Ouw5piyuEoI7MwrJzv1ZG+kBe1nPrqAklQvJtQns0S7DiBzN83XJ+RdOJfUmoXC X-Received: by 10.236.4.201 with SMTP id 49mr3876180yhj.47.1400915096206; Sat, 24 May 2014 00:04:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.67 with SMTP id g61ls2070350qgg.12.gmail; Sat, 24 May 2014 00:04:56 -0700 (PDT) X-Received: by 10.52.164.237 with SMTP id yt13mr7271272vdb.18.1400915096131; Sat, 24 May 2014 00:04:56 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id ni9si3067251veb.58.2014.05.24.00.04.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 24 May 2014 00:04:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id jz11so7208750veb.7 for ; Sat, 24 May 2014 00:04:56 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr8649301vef.12.1400915096014; Sat, 24 May 2014 00:04:56 -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.221.72 with SMTP id ib8csp87475vcb; Sat, 24 May 2014 00:04:55 -0700 (PDT) X-Received: by 10.140.26.179 with SMTP id 48mr12785733qgv.51.1400915095629; Sat, 24 May 2014 00:04:55 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 4si4241100qas.44.2014.05.24.00.04.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 May 2014 00:04:55 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wo5zK-0005GM-Ir; Sat, 24 May 2014 07:03:26 +0000 Received: from mail-ie0-f179.google.com ([209.85.223.179]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wo5yf-0004lp-Eh for linux-arm-kernel@lists.infradead.org; Sat, 24 May 2014 07:02:46 +0000 Received: by mail-ie0-f179.google.com with SMTP id rd18so5784160iec.24 for ; Sat, 24 May 2014 00:02:24 -0700 (PDT) X-Received: by 10.50.67.83 with SMTP id l19mr9810153igt.38.1400914944266; Sat, 24 May 2014 00:02:24 -0700 (PDT) Received: from localhost.localdomain (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id p12sm9980695igx.18.2014.05.24.00.02.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 24 May 2014 00:02:24 -0700 (PDT) Received: from localhost.localdomain (apinskidesktop [127.0.0.1]) by localhost.localdomain (8.14.3/8.14.3/Debian-9.4) with ESMTP id s4O72MYs009804 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Sat, 24 May 2014 00:02:22 -0700 Received: (from apinski@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id s4O72Mhe009803; Sat, 24 May 2014 00:02:22 -0700 From: Andrew Pinski To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/24] ARM64:ILP32: Use the non compat HWCAP for ILP32. Date: Sat, 24 May 2014 00:02:10 -0700 Message-Id: <1400914939-9708-16-git-send-email-apinski@cavium.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1400914939-9708-1-git-send-email-apinski@cavium.com> References: <1400914939-9708-1-git-send-email-apinski@cavium.com> To: linux-arm-kernel@lists.infradead.org To: linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140524_000245_574303_8EE695E9 X-CRM114-Status: GOOD ( 11.77 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.223.179 listed in list.dnswl.org] Cc: Andrew Pinski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: apinski@cavium.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.128.176 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 Signed-off-by: Andrew Pinski --- arch/arm64/include/asm/hwcap.h | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 024c461..cb87f91 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -46,9 +46,17 @@ #define ELF_HWCAP (elf_hwcap) #ifdef CONFIG_COMPAT -#define COMPAT_ELF_HWCAP (compat_elf_hwcap) -#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; +#define COMPAT_ELF_HWCAP \ + (is_a32_compat_task() \ + ? compat_elf_hwcap \ + : elf_hwcap) + +#define COMPAT_ELF_HWCAP2 \ + (is_a32_compat_task() \ + ? compat_elf_hwcap2 \ + : 0) + #endif extern unsigned long elf_hwcap;