From patchwork Mon Nov 2 23:30:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 7538841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 736D0BEEA4 for ; Mon, 2 Nov 2015 23:36:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98E53205E3 for ; Mon, 2 Nov 2015 23:36:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B68302057F for ; Mon, 2 Nov 2015 23:36:30 +0000 (UTC) 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 1ZtOcc-00075Y-Pd; Mon, 02 Nov 2015 23:34:42 +0000 Received: from mail-by2on0055.outbound.protection.outlook.com ([207.46.100.55] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtObJ-0005cB-3Q for linux-arm-kernel@lists.infradead.org; Mon, 02 Nov 2015 23:33:26 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; Received: from localhost (109.252.143.100) by BLUPR07MB610.namprd07.prod.outlook.com (10.141.207.15) with Microsoft SMTP Server (TLS) id 15.1.312.18; Mon, 2 Nov 2015 23:32:59 +0000 From: Yury Norov To: , , , Subject: [PATCH v6 08/17] arm64:ilp32: share HWCAP between LP64 and ILP32 Date: Tue, 3 Nov 2015 02:30:37 +0300 Message-ID: <1446507046-24604-9-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com> References: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [109.252.143.100] X-ClientProxiedBy: DB5PR03CA0016.eurprd03.prod.outlook.com (25.162.150.26) To BLUPR07MB610.namprd07.prod.outlook.com (10.141.207.15) X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB610; 2:Je2lBOFP0L/r+m2ax7QHhGEI5p+bNqw+jynVTyElJ8WFPH3GBahMmuHQ/IjiGz6haPllLJPiBDqAAU7rfA0/JkLoqxSw8lZfwaKCn+tacl6wUl/hlC2ZhoXtgNzeH5lmuLYsazbvJCqmJbq3rRLvVpPopqdXYQmev2oJ7xTtROM=; 3:IUl5fz6h3UPLuL7woLaZ4Y5j1LmEWSdt/TipEauNF7Cc7e4U3r4S49aIGaHedZpS4TmVQJ3mFCoiCvOKf4ixGHDUguKg7Nv5ZNS34hQ7VvN+YaLlnnFC7NqDOT87aA+kIJJepFmRLfk26V2X9bL+Mw==; 25:L+huo+BliKjJVwWcRnzVYjmYMFBWaqGCZAVqhXJ0VFGAabu62HHq5EoSt19/AhId+IkBjBehjRHu86jCRi0Cr3kwgdQZbP9ZAHLkv2rOcItNR73rxvfWU12/VxzV0mSK3foGKoI7xA8VvjgBAe+OIn9ucs4QQTasy71qMxoCmAE8/EqPYdrwlmCGjYARhHN7739iZpZPcwu+Oe0LuyfwO1kEK6hDPXczjrjPEObSZTiW06yCGI4SPAomxg8KHc7bXSwsVGLCBknfGhA8hA5U3A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR07MB610; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB610; 20:6+e/8xKAHo7GP8hthDHlgF/O3hbCGOg8PPYwlaxs92N1BhfaAnMYswLBYVGhF5l4G2+oVhrkbxAYqGdOmg72ygWkAEynUvW9Ylx40LiNPAQOAorjPwAVEXl/3RKmFJLhlq7ayS90YMqseTqi6G/F8f/APqP1uowWz+eI3Dvfc8E78CacJSGTKeuxsZ+7Gpgf6qz6ZOrASp7tPsUoNoslYq01YEwEwMwTwxKRy1Fg4Iwu1+/MPlcIR8qr0+6ipjrAuEcHNXU8bbjwxsApVEfQ7RcC9keLRKpAZwT+g9JHrRHCHtc6k1ONTFYw4BSpIjjZSAm8C9JngbIiXdRLp3gUXwXkUwumx8jEEorQ6L7inZWMa3j5nEB8y2972l26kzugGgAWQVf0SKEcxvXh7yp+QpUpE66Rzaidv0k98shygy6mo0j/aWb+P0WaA6oONuF7NG1gePvQhut9+qU2G+x6G27ZjiKlT2+l5ZyoopmcbTkwxec13alKMww/1VzREH6W+uCr898ezO5ZH5GBI0LWYW3suTVx9vuCTte5TEVeNevSupLwxblhuAa2pryRq26NyAy/GsiYqFvRT95e/TW6UBunB9uKP7XfZ86cGHMlLIw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(10201501046); SRVR:BLUPR07MB610; BCL:0; PCL:0; RULEID:; SRVR:BLUPR07MB610; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB610; 4:8Vig4Yq1H99hHkuLVkACMdSte62cmOUYkaMK5hLmWJDgZ/jxkLH+BMqUuXNiAhHelB6Srbv2jlcwvO2vfEyQWSsTvxpacK8gZxif9uTT658MpfLYuWmRxP3Ys0F88WAcZ0Odt4KvFHsgrA4j7mRhbaFZxNokb5IS4YTU6Jf1vPK/nAwNcGYDRABKdHi6htPhw7s4Iu56kaSI7Ti17ofyTXLTJjc9z+vyt0HmIriS55TKkZTP3LZtF/fHwp/SS0GexTByT9zDty5jTnOX5fWD7WH+L61kX7JwoVV/Ious8iEDyAf2b9LE1R/1oIXjBQCHa2lrjtKGUhfikqc2qMCyZbUiRFJin8qJwB6sXU7MFd6U8Cisix/h95lDo2hkZs0p X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(189002)(199003)(50226001)(50986999)(76176999)(77096005)(19580405001)(50466002)(106356001)(5008740100001)(229853001)(19580395003)(48376002)(76506005)(5003940100001)(87976001)(66066001)(5007970100001)(189998001)(101416001)(107886002)(5004730100002)(47776003)(5001960100002)(42186005)(105586002)(33646002)(40100003)(122386002)(5001770100001)(81156007)(2950100001)(2201001)(97736004)(92566002)(36756003)(4001430100002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB610; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR07MB610; 23:i7PglNbZ5Wmtoq6l8MkJxP8C4e1BUaT/AixeVgQpzl?= =?us-ascii?Q?3cU0TYbauon0HMRwu/pRlG+DxgBOmU3rlfMSM4Rh+7cFgfnwKPlLFwxiIdxB?= =?us-ascii?Q?WfosKDA/GuZM6qo20VmJmJxuHz4WcvommP3SSvvzVwJpEAmCZmaVbcMAHx+E?= =?us-ascii?Q?VP5u3QFLonqKAflTsO5G3mTUpPyEO+SGuGwkCSDbkmLlItUZmJJMG8kN33w+?= =?us-ascii?Q?cJUSBeQvrk3Eyil0Ikd1JBPK4dJACnPmQWi7khZ82zixODmz/NxFkqlJZThM?= =?us-ascii?Q?eMJ8xT95UUp6FBNU98yK0ciPCyDKycIWf962MAkJjfnIRGDTks4zxLwxKLGJ?= =?us-ascii?Q?iZBXcZF0VtdasmCPVmBnTdDfxx4xh7RiF2l4MfO8Xvt1myDZ2jc91cqTuq8P?= =?us-ascii?Q?epYg8d6P0hlA7KqxhnPzf1iaEfZmvqJuHaPPzU06PtAnvDEWMeSBOm3hTOZ8?= =?us-ascii?Q?K3DenON7+PT+g2IKbt2RUW6stXOqw6ZJRp+ZvDsLdJOHUagZQZpSQbV+7RcE?= =?us-ascii?Q?qAqwXr723O76StHCxVrAiKTEW+jo1i1/K2oU3E/m+Jb6xlrAbWLKqmqGjJCA?= =?us-ascii?Q?M3e7NF2hqcqDwI4omwSoI0sRfMwMgltNfYH/Z+/Ahp+fK2JQi0OsLd+wqSkC?= =?us-ascii?Q?9t88HW3tuRFheAS/WgX/RVaqANQGA6lE8YmKUWXboskHsUxoi/3pkVuq8SGM?= =?us-ascii?Q?bJW7OJA6/G4N+iW4hj/Uj35kYNgI53YAK0vZIU1DPY5IB2PeY7OhQC/Cd+Do?= =?us-ascii?Q?rKo4+MU4j4OMhkPfrHt7mKTkulEbZZxJEOrCPvuDJCAs3ACh6w/ayCaShyHy?= =?us-ascii?Q?MSsVEi21zTWhhxjmLwNAAViD7mPfTzN7IiS+FLNx3jYWh8O6mMdWvqLC67CB?= =?us-ascii?Q?UwaMFbnLAFGqK4IDiDDXJvHBKV76NeFqdjOBcgvuyHTD4ft665BKOgjCRUzX?= =?us-ascii?Q?zerv58rQbPCnnyYAF6wcj5tU8CoPxfkIhe6jJbcR08bvuulBIEg4MpLwf1Y2?= =?us-ascii?Q?pZr96G0s8w6qTOhy6GzBPMNt2lPzmHsL6fMr0A6+HHSHmuOgu2BdiwJLC0g5?= =?us-ascii?Q?e/dso6lwQ0SawgeCrCH7ycqcrG6/2RJhqDLWcjkB+8N7W9fQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB610; 5:EUfD6HzzXiLdGdvefLwXcfr6eVz8AYS2UIehU5tVJelzYlnUeZkWjDMiIxIx399m1W/DXQZvJV1W84zaIwI3hlRYYbHnTx9xnXNpBHKGnC6YqpbVpC17ypxV3Vv7o/REuCxBNZ22FHlZK41hyaq8mA==; 24:5p9SfH+yqo7CXJIv2lsjjMbqvN02UHMXWBGRPWxcythf2vY2N7ExEL2moUAc+R3N5MpOb9orKlQ5T5F036ovtTqueG3uTrnePN9NUtpxt3k=; 20:Sna8ydixnFfKvhALnoRYcriOTAsIEpVIuvNQ11Ha9dzOlycsBuUAGuZrXF/qwOwL1IP5np3/qLffWZF8S/yAqA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2015 23:32:59.2311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR07MB610 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151102_153321_915182_5456803C X-CRM114-Status: UNSURE ( 7.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pinskia@gmail.com, Prasun.Kapoor@caviumnetworks.com, Nathan_Lynch@mentor.com, agraf@suse.de, klimov.linux@gmail.com, Andrew Pinski , broonie@kernel.org, jan.dakinevich@gmail.com, Andrew Pinski , ddaney.cavm@gmail.com, bamvor.zhangjian@huawei.com, Yury Norov , philipp.tomsich@theobroma-systems.com, andrey.konovalov@linaro.org, christoph.muellner@theobroma-systems.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Pinski Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Signed-off-by: Andrew Pinski Reviewed-by: David Daney --- arch/arm64/include/asm/hwcap.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 0ad7351..1e5361e 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -47,9 +47,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;