From patchwork Wed Sep 3 21:19:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 36649 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 11B67202E4 for ; Wed, 3 Sep 2014 21:22:32 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rl12sf46960613iec.5 for ; Wed, 03 Sep 2014 14:22:31 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=gthZrfywBOqaZXh8v6DWkQ7d/PLVve1+cvktqQoxNy4=; b=TEXP7yLq5Kch0R/YNT8fVjW43lD8LT18LowUJ09FBGHxdsNAB+k57D3lDjzZCExzDl Q01TDa2gsU1GNKu257isbRyDfgWbPeQiZJ4tmQh1Sp4/iVR57wgsxJyJePTTDqqWBoDt HLwN08qQ6174aJlxA38DHyaeCfqSy51jVBu0D+TqWIhL8J69DZaWMb75waEUREIaxjvS uP6cBZd8zXGNxHpKtObQDHaUado1H8TG7/28l0fkZE6KcMKqYNyKvI1MXzk5VVZvdOlZ me8/1gY8WsSpGAQDyUsouc/a0YeHCEe9v5BMguT5BTFzmH/T1dhsQlmaUCdRfDg5KZLr TFTQ== X-Gm-Message-State: ALoCoQm4YdhKH2kyPvr7NlDiJlQmx+jP98rjDL/qICqO3oWiG/KF8SibZUqcOfJ+Mer2gBa2fZGN X-Received: by 10.42.36.69 with SMTP id t5mr49599icd.11.1409779351466; Wed, 03 Sep 2014 14:22:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.18 with SMTP id z18ls18754qge.0.gmail; Wed, 03 Sep 2014 14:22:31 -0700 (PDT) X-Received: by 10.220.116.196 with SMTP id n4mr110147vcq.6.1409779351345; Wed, 03 Sep 2014 14:22:31 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id fc9si1733185vdc.2.2014.09.03.14.22.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 14:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so9601998vcb.16 for ; Wed, 03 Sep 2014 14:22:31 -0700 (PDT) X-Received: by 10.220.118.136 with SMTP id v8mr64414vcq.50.1409779351279; Wed, 03 Sep 2014 14:22:31 -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.221.45.67 with SMTP id uj3csp740321vcb; Wed, 3 Sep 2014 14:22:30 -0700 (PDT) X-Received: by 10.66.124.136 with SMTP id mi8mr427230pab.89.1409779350435; Wed, 03 Sep 2014 14:22:30 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dr2si13073823pbc.248.2014.09.03.14.22.29 for ; Wed, 03 Sep 2014 14:22:30 -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 S932412AbaICVUb (ORCPT + 26 others); Wed, 3 Sep 2014 17:20:31 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:45307 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756551AbaICVT3 (ORCPT ); Wed, 3 Sep 2014 17:19:29 -0400 Received: by mail-ie0-f182.google.com with SMTP id rd18so10450393iec.41 for ; Wed, 03 Sep 2014 14:19:28 -0700 (PDT) X-Received: by 10.50.118.4 with SMTP id ki4mr349535igb.16.1409779168360; Wed, 03 Sep 2014 14:19:28 -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 an1sm6532114igc.8.2014.09.03.14.19.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Sep 2014 14:19:26 -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 s83LJPhN031063 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Wed, 3 Sep 2014 14:19:25 -0700 Received: (from apinski@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id s83LJPnD031062; Wed, 3 Sep 2014 14:19:25 -0700 From: Andrew Pinski To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pinskia@gmail.com Cc: Andrew Pinski Subject: [PATCH 13/24] ARM64:ILP32: Use the non compat HWCAP for ILP32 Date: Wed, 3 Sep 2014 14:19:07 -0700 Message-Id: <1409779158-30963-14-git-send-email-apinski@cavium.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1409779158-30963-1-git-send-email-apinski@cavium.com> References: <1409779158-30963-1-git-send-email-apinski@cavium.com> 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: 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.220.171 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: , Signed-off-by: Andrew Pinski --- arch/arm64/include/asm/compat.h | 10 ++++++++++ arch/arm64/include/asm/hwcap.h | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index eca6eec..2f84d2c 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -296,6 +296,16 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; +#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) + static inline int is_compat_task(void) { return test_thread_flag(TIF_32BIT); diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 024c461..31e7e02 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -46,8 +46,6 @@ #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; #endif