From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756630AbbI2WTW (ORCPT ); Tue, 29 Sep 2015 18:19:22 -0400 Received: from mail-bn1on0063.outbound.protection.outlook.com ([157.56.110.63]:49881 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755282AbbI2WRa (ORCPT ); Tue, 29 Sep 2015 18:17:30 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , CC: , , , , , Yury Norov Subject: [PATCH v5 13/23] arm64:ilp32: share HWCAP between LP64 and ILP32 Date: Wed, 30 Sep 2015 01:14:10 +0300 Message-ID: <1443564860-31208-14-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> References: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [91.78.158.8] X-ClientProxiedBy: AM3PR07CA0023.eurprd07.prod.outlook.com (10.141.45.151) To CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;2:Qf6QHSeWw9uL9jlPDWwrE5wVk9bYbJXgewDAPjpbB2FQu7JPR8Mu9LZ33kT01DnGmaTvrzTDmaagCmYntzJPtG+rB25g+uFwuXKn41jtdKN35+yAGxRZ7unBKLEDs1mJL1/28TnmuPRZRFYtbjoUyQNEwbhTW+gxUFFk1gF4WnY=;3:jp+YYDeqky5mEekja/uZODPvETvH0BDXKKwGM/dS3OLX1BquZwgUOkiPa11l3LxsmKiqpmfzFu7qFPRGgWAaSUya+8dj9+gjr6VhyadF6cY9S7xkU5n3fmV0JBKHMvh+PtHqjCYVH2QU7Skt9rkwgA==;25:ITaAuJhhoezIphLceUXs7CBBTfxIUbx8mVROSUNYwd33ynNlSlxcd4mR4BLoDhyHAR+2oqxQt7rYSu3nNh0oRKrw9wAcaBwnCm0z9S31o7ppTeF/eI60CPEv5TNrcEo3iz2p+nZT+PsPNKhGLQxOnP+mwHgg+C31MtVzwiU8PI4HXaeXFuhiYauboDx0rPW65FdXXOrFx1g7w8y37K24VNqpSuJpuLv6LlaC9SrRWQ9mbA88VSELKX/0MVcfWa1M+7ZRMBjg26lNF1EY6mk04A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;20:wNkcLzJN0RL7Res+u02GdTGUr78GCqSQYMaiVOxnGqr4P/1QteOXV44WbifD8U70imUsoktwX4aLy/X2Ekbi1AQWGRAZ7bdFOv0Z7qkKL3t/oKOUMnBSeabSMSyUuodE+VRxi0PrtghSmpjwRWEEycusTHfce1NrmO+Bn61+closwXiQwvvJXt1ziqogX83e1eYc4SXlris5JKPSxmjTZBkPD0lLar5mv2JeGGhLkClrFrNI/YEy3J7SAOkynkXwDLZuKnw+/PBIf6pBnZaFsd7kFId5DEKFryiytMNxI1BkirK2iSVIpu5n+8qbdQpzfhhaTTwqzw2zsQzLXNz3i3vgnjuZ0yiO48/Hd2CnRWNMioy93mM7GB8aC7kxWtcgtSEEOadjesmQuDv3txG87cXuKTno89YiPmW/NqWcy9QYT9PMOuyT9z0qkxbRvFqrJwMsH7jp8hCcbmQhEDeCMYEhZUaEfzI4ubS5GwoDk7IMHRewzhExdPKHxzWRmGaPH+8W841JYvc8VjLd+1Y9pRMRXy92IM/EtcpxwsyGmICkQEvQqMWR0xDyPmnEblCGdlh8BkFxTp4cipQSGE3AaPR93Tryc7x2fa4wYuNosYw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001);SRVR:CO2PR07MB619;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;4:50+r8lBum4+LjU2BaskuyNQPpwqwvbDrcThXkHJzyqdhW6V+3oDppIfm/1RJKyTjFRNK+VRqp2UPCHbJn4uLjBA8/7yjP4EgeMQ26mjAuzKSIVhelYY0qMO3lYR0xbQNneZ0UlehPTPdbVFcUY04u0BCrB1Nz4UXXCPeIgTi93yH0/GytkqNKsOKAxoG4ZQB3oMBWYnUquzfqFcNfcp4zZgZNzpgpJrZiA8X7/JFVoZTHF+zQOT8neizHsM0kGTJsBFo8rgLwZh0PDgkUymqgLfYiGHy6bce+bC4K8fz01zGy0YtZqDILOwSkPE0+xCe+qrtBJDFFTLZ9xpcyphGK4JjePj9eXtU4lt04Mr8+/A= X-Forefront-PRVS: 0714841678 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(6069001)(189002)(199003)(42186005)(66066001)(50466002)(64706001)(122386002)(2950100001)(48376002)(47776003)(5008740100001)(77156002)(46102003)(33646002)(68736005)(97736004)(5001770100001)(62966003)(92566002)(5001860100001)(50986999)(189998001)(5001920100001)(4001540100001)(101416001)(5007970100001)(40100003)(5001960100002)(2201001)(105586002)(5003940100001)(5001830100001)(76506005)(87976001)(81156007)(229853001)(106356001)(19580395003)(19580405001)(5004730100002)(76176999)(107886002)(50226001)(77096005)(36756003)(4001430100001)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:CO2PR07MB619;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO2PR07MB619;23:K/O/QqBBOL6J3f0UtiBiBkeXUBKfox03kmd0hZNBP8?= =?us-ascii?Q?lV/btpTk2VMzObPci7ZTX7uDfR2B4wisRRdyPwZmJVdk4cuUqKBi6RZ0E9nY?= =?us-ascii?Q?nJndB4SZ7JJvJTPEPpOVteHss/xBJyut9pZmmFIKTG6Ws+WwyWcOSG5BtHKR?= =?us-ascii?Q?cPf8i/ycSCSackiTqe/qo6+Wtgyq8ltY5Z2zD27uDHdo2TnAmOdNXvkm6QmT?= =?us-ascii?Q?DQws+AcILcR+/xh5J2wYcV+vUt5I1haYtf9zyAyVge6a+JsW7r/6nfIhZ64/?= =?us-ascii?Q?WaWBP5DTOcJ6RJ8W8u3ZKKATP22x8pFi5sLPsHOQ5p3+zNLcx6uKxWPIB6Qs?= =?us-ascii?Q?YVaLp7YqR6+YSVDX8KVo61Uc97iVeKLKE/kKGmBsxPMtg1Fskx6jQqXB1NoU?= =?us-ascii?Q?0XiGeWqdG6S7IZQ7/wE/CFdQ0CCLCsG2L4Ao30Fyq77ubR7ATTWUPTh6qbtw?= =?us-ascii?Q?EQ01LCGIHxSQD97pNKb6PPKm4pejhB/04uEIbEagGf5Ev/NTrBX+HaPAoQQA?= =?us-ascii?Q?gFqrp7CeLAfhKwabYcziBJHslTSzreyXD6fjZBoXDTIRbRkcbQEtZGwuyPJL?= =?us-ascii?Q?89Ok6QKnc7p7onFO09cn8qwcj6eCRHWqdHoqZyhWCB6pbG25/c280VBNw8HV?= =?us-ascii?Q?XHr5r7jrVKjaTo9sA92/8uUIiOG0NRblcpKJTz8hZOPh2TjbNq7iJ0sEVTXg?= =?us-ascii?Q?4grKRMnWrDLELhLVYJe6wMbXiKyxACqP7yaCFQ0H7zPlsRU/Tboz7hgPY2ln?= =?us-ascii?Q?OKgTKDNMhk+onf2ikqelvVezaKT9ZKHgIrb9H2Eiod93dWFHNde/yzjD1NeQ?= =?us-ascii?Q?e6yO8uOMvXEx7HRIHWaTIadUpwoQQa4eKLORW/mx75l2e0RC1ckqLFvLnwRC?= =?us-ascii?Q?yzyaFxfujowpWSBDgceQ4hM6CmwegrpxPSTYUOrSPqgD4dDAZD/TKEF/SDqG?= =?us-ascii?Q?obNoB16vk5QUpADBfIVJM54D3NDgJBJjFpwj0N6taVWYFh8iEeRvAtrIzw3n?= =?us-ascii?Q?CfT28VQbQXU3UNWSSh8oOy6Lw75kFyvRVf0g3X4Wj7jOpKvABy6BvvWiHBHM?= =?us-ascii?Q?M30wUx/Ec+ECA+0gf+W2tDJGudysQcYmSH+1EkpLFSa8FeQl9+k2JxLi+Otr?= =?us-ascii?Q?9RmIUqwEGQGVLzP5YV3FKnAlwlWhXU8QRocRK9MkRyfevVYxKQCD43XVoaP5?= =?us-ascii?Q?u3RkSI5xP/T1oJTvBe2T0xnbflosHuK6euxAozNdPPjmJ1zhpq904kbJDux6?= =?us-ascii?Q?gGgbR0bEwtyM0PL/97KQfI7M7vFBpbrfQPGsG/BOTKHbxyrpW11/65R9/yrT?= =?us-ascii?Q?9hIZXQcoah1hX2H82dSEELoc/e7EUrNnw7PH7CQRc6?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;5:l7Nlo1BH3cBsLGWcYyoDwGKW1tzNWGPqbw0Sj2mN0nOoBOhZL7w7Rr9g5fNVRyM1FGJXW3J8/eIY3VeaPCojgaNBjHaW9VzAua0/Ey+QQEoBDsWI2TEzVCM0KEos5lqbg8DrD3R5VHBzWS7zaMSioQ==;24:n1q0+p4KhtjIp1e08fdGjinfgNY0yclQwizaKjFGfScJhWvMKj666khYbT85+zF92K0S0CbTLLeKUnc3lL/GK5QFMxFNTNe56vyO/AQ34hw=;20:BnMKFqL3dyeR/ZguW0OAzxUMM1Iny4Ec8MSYQj0xG7Cv2rci+xBjM3Gvgnn69LXrd5ZCEgdeNhO/sdg5o6gjNA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2015 22:17:28.3611 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB619 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov 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; -- 2.1.4