From patchwork Tue May 24 00:04:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 9132555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A5D32607D3 for ; Tue, 24 May 2016 00:10:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A73F2824F for ; Tue, 24 May 2016 00:10:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E7CB2825E; Tue, 24 May 2016 00:10:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 34D5D2824F for ; Tue, 24 May 2016 00:10:03 +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 1b4ztn-0008OT-Es; Tue, 24 May 2016 00:08:39 +0000 Received: from mail-bl2on0090.outbound.protection.outlook.com ([65.55.169.90] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b4zrA-0005Pm-3o for linux-arm-kernel@lists.infradead.org; Tue, 24 May 2016 00:05:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=CDuBvEcof/ZkIKZXnuNpspNzryq2h7Lsx02iWrorw3E=; b=dHIe3eImAEANHiksey5utwTc1CeDhTliS99wHZbVjuXSDUJWdr0yFMrRsWJm+jnyAamEIxu0qF3ToJHSzetCZEa1J+LDfpKYymeu4oB1t6bCDTBl4pJApDpA24kCu43rxJFawHjhVsumfkMoD/U5lKiajaYOnWucAWw5wdGaRik= Authentication-Results: arndb.de; dkim=none (message not signed) header.d=none;arndb.de; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (50.233.148.158) by CY1PR07MB2230.namprd07.prod.outlook.com (10.164.112.144) with Microsoft SMTP Server (TLS) id 15.1.497.12; Tue, 24 May 2016 00:05:46 +0000 From: Yury Norov To: , , , , , , , Subject: [PATCH 11/23] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Date: Tue, 24 May 2016 03:04:40 +0300 Message-ID: <1464048292-30136-12-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464048292-30136-1-git-send-email-ynorov@caviumnetworks.com> References: <1464048292-30136-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.158] X-ClientProxiedBy: SN1PR11CA0022.namprd11.prod.outlook.com (10.164.10.32) To CY1PR07MB2230.namprd07.prod.outlook.com (10.164.112.144) X-MS-Office365-Filtering-Correlation-Id: 02cd9f1d-ad65-4cdf-c2f0-08d3836727d8 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2230; 2:C6Vks+xOcLHKxN9palxpM6TqrCEl+y7TdLhz4/o/26GmZMmkUIlReerKFIQ3+qsgUl+DQUWtcgMS4wMbE7RED6GWeE7iFZ7pLSpR7v2hYm25hvCM7qayrZAClgaf3i3mxixsn6ogl0AXkUWmtFXxzS4mgCBs/95Uxzld8dXX9/pYg/iTV3NbxlHFKVDrZ4HO; 3:uaPP6pjacGEVD4HqONiv8Vq9x/eaulBS9byxe21G/AxWHe34wRjExhubczJnc5PiHPi7grHW0G4LktMLKfvkPLs/bmoxiLCMecAhsfys0UwTVRDEOZv7BDU3BaGD1n5W; 25:MvryJ3X+8L2yGovHQrkKNvS3DVFATZgzhLq9VWBnSlr9d2pHnYEcXV7Hp4MW4Gyqmn1NnxBxs/Emd85T0nVtAIWC7FC3kwK93j4jfWgvK4zZ7k3p6r1TFfWB6jjeYTjSVH4//OUZsI6cT230gXEYjXFmqqx3BuzqBO5uenoTzhu8ied6T1GAHL+SOpGJlwJypFm7j+3T0vnmKgGQWgVOnV0DELaL1MW46E72VrpUyZGUtjEc6Ygm4fTcT7Qxi/q7pud+DIRBvwnQdnJvpA/ZhSfPObEtO+pAtjpZPYT+6/CCWBbIxcAke3TWk0ElcFKXn4bdpBmws3RDn+sue981VdRhako0qTSM7o6tGHvghfjTPx5gAEUm8jIwSzeCwok4JHWLgSFt5Ih/AH4uy1XTHMqb7d8Q8A4Uj5JIH/asR84= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2230; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2230; 20:9Ei5/XrGjmz7AjnYtUypP/qPEhu4WO5AuXtOZJoY02Rq0D/2CQZ1bOEEVXU/Ntflq+IKUKL/zSd15pSdDW+W4DDlo6qyaidL31Jg8U3Kq/djDDHUGP8Ra+gdjRZmekf3X8JUzLXrJLkJdAdvczgeg3R5740E8+h0lM0eHkVOVBu3zvcMb9rtkD5MjNtkW0b+nqY2UlDhw2LdLosTAOQmMpqOr/qG2ghy5hh/QL47jumGWeUgzSP85JpCiD+hqXYzFGCNWkpC2fgN4t0IgTsiimri7TE/Js67Z/cEl6S+/MR2LvRw2EV5K7D1zndoksXEH8bpMNe0oFI4IBI9nZIZk90/aSBfJEe0zwZgF0VIYxtYd/iGyMGohQlsdzc4dk3n/TeO2jy3Q0oJJGODFJ7IfWbeikG3iMgwSj+23vX7pJomqjR5n/zW8/8HE1h8EzJQFUe8XIQRP/NofHcrplCGyVtyaG0qKA6hxASIscMYIpeTqjqF6/FndElUraPgUpBFbzMVgIdxIZhB6gzjOoPA/Uhyq+bIKXY4sx7RqAosPwsKaVtPU+AM3aE92CML8FEPZbfxWYFMxVmAulIbNs/5STeairbtMZAdox3g3nF/Lbw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:CY1PR07MB2230; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2230; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2230; 4:D1s+msOHL+TPpryjpZikapIXyoCOdNh4hxNcRZG1ad4vXFowwY2YjiOQEYlQpzeQm6ctD0bitr6t4Mqv3LkNVWxhSqP7mwHF8wIfT2M52LH79opvJKoQfte4ssb3CTPooNW79hTbKtWs88RMGFVp+zwDSnjGapJKTGkLwXoLbPKubplljTzoc2jXG4xcFFm7cjY2n51f2XkpG1xPRyc8dZUOMwlNIZicPgZZQ/3O4U6Na3lePE8+wkSnXCS1TZlvmgCM53DKAX0jTdjfVXrk9peqlOn6cqzNRgBBfKJoqL0FRpWCJXFOJFv9ZAm5G1SEcCyjAAC0zgR6X+e8q2UPpxcNepE7anQcPe8VyO9xTl7in4CkQoa5LJmCH4jvSAAo X-Forefront-PRVS: 09525C61DB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(19580395003)(36756003)(5004730100002)(19580405001)(5008740100001)(2906002)(229853001)(2201001)(4001430100002)(586003)(47776003)(33646002)(4326007)(66066001)(6116002)(76506005)(42186005)(92566002)(77096005)(2950100001)(189998001)(107886002)(5001770100001)(81166006)(5003940100001)(76176999)(50986999)(50226002)(50466002)(48376002)(8676002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2230; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2230; 23:KSXKhwrQntXh9/TBQBlqq8SbyK2yjqopYJGSJUNj+0fufv26d//IbqavC2oEBdR9ug2gCNde+hO8W4ehAfYzqZ5sqVX9IVU8N+x1r41sG6oaGzG+ngveiPpfi2J0h4cg0bT95IPwENNSclYKT+g9kMZ+AblYSR6DOdlEDjrqMrRmF1fC/gj/pCiTfyX2pm9MebZ0iic1qNcSR/ahR9MvB/JaLUst2gQxJ164OvkglNObuQvA2DXGKGz6jstiXl7HOJIKq0h0dzaQLTxXq/pHEN+iSv/sxduvrFgcEip9CrYlzDF9p6lMb3nhJ8wrBc0Y16f6mxC2idv9KiRr5FAAZWe+W8gNkm/eUNzAgn8vbp7NDQiLzrzpCKCX6gmKligVK3Y49EkX/OxB82S6u2p9CwNcXEg0IX8tIKnP+aBwIjt6wdVnkUMvONnAxGKsvMwmlSJ0Uum0/Sm/akL7kK8MC8a6buosj6tQooiiw0AgkD27mPrP3uobdMTKjuUo0VjO6r7Jesn3ixXBxqscjWvb2vvdhh1NPn4ZZPFEnmTVySmIDZlYUuPHM7ovZXfSCjcRsXM+sr9nFLZ0qpQ9pJjhnoNwwweEv/cGu34ER0Me0aBXSSEHZXO0zd/TLMnprM8J/SNG3Z3yrXN7qc7AOP6eJnz6TztGnWSB5KGCQn+XtoTua4uCrwpOZkbEKAycJx5+o203C8/mZgKK3UyOerG7nN1UNMS4ySnXHoFiUWWWyeKqb/TLkqmzeycSjndG49rw4YHWZAqW/NY4rpLCQqwnr3ypHQangmadsFJwrQcm7A/PG+Wcg8Hx9I8dK3l5NxWZucPVt8izQDpdDVbmqPaRRImqYvfo0WnA17tashgiQUIGjGffDI3+A/MRQP2HOWHNGLN4I06k5Ip/ACIv+myAgaX12eDZmjdoVfZNtDzbk85AQ+wGuXpakLMSJMscTm+j X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2230; 5:AnVPSC50ZnvPD8A3HyU1uQkm12ic0Mxd2TycmxwOGAIY3o8HMRyuVkdi9GPk4FA+Qhm4A6RU+RXb+cqZLaygNwTss46DNQ+gv85XHkgmRVdIPur0Nr2SBDU4isX0iYfpgnQWtHRRw4XGGIMvUcWgog==; 24:oQl7IeO7A7vuSy0AaHl9OYCVU7+y++4dTBjto8iKTrkuwwwSwhCpOdAnC4me2hiEpdxTIeqfUQeKc4kURaAzrJLDi/p1p7FTzoJKCTjRiqg=; 7:pvZeBwQ0KyGienju4nhf1ONQ3C1J45HSbC4nFQrRF5I7qPbSTP6m5SuftUHwJks5ieuItJ+E7lXIV/850/abe1MZdxEZBfmw5xw11YlkhTE9EYj7Z2xhqYSW3WaJL+DKK9KFo94fJZvsSIpkAQR0gBCf0Ky8KooNV6d2m0vpsruAXDk/t64m3CpEU0YeE00M SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2016 00:05:46.0884 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2230 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160523_170556_403361_1C292C13 X-CRM114-Status: UNSURE ( 6.70 ) X-CRM114-Notice: Please train this message. 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: kilobyte@angband.pl, pinskia@gmail.com, szabolcs.nagy@arm.com, Nathan_Lynch@mentor.com, heiko.carstens@de.ibm.com, agraf@suse.de, geert@linux-m68k.org, Prasun.Kapoor@caviumnetworks.com, klimov.linux@gmail.com, broonie@kernel.org, ynorov@caviumnetworks.com, Andrew Pinski , schwidefsky@de.ibm.com, bamvor.zhangjian@huawei.com, philipp.tomsich@theobroma-systems.com, joseph@codesourcery.com, 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-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Pinski Define __BITS_PER_LONG depending on the ABI used (i.e. check whether __ILP32__ or __LP64__ is defined). This is necessary for glibc to determine the appropriate type definitions for the system call interface. Signed-off-by: Andrew Pinski Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Reviewed-by: David Daney --- arch/arm64/include/uapi/asm/bitsperlong.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h index fce9c29..4265243 100644 --- a/arch/arm64/include/uapi/asm/bitsperlong.h +++ b/arch/arm64/include/uapi/asm/bitsperlong.h @@ -16,7 +16,14 @@ #ifndef __ASM_BITSPERLONG_H #define __ASM_BITSPERLONG_H -#define __BITS_PER_LONG 64 +#if defined(__LP64__) +/* Assuming __LP64__ will be defined for native ELF64's and not for ILP32. */ +# define __BITS_PER_LONG 64 +#elif defined(__ILP32__) +# define __BITS_PER_LONG 32 +#else +# error "Neither LP64 nor ILP32: unsupported ABI in asm/bitsperlong.h" +#endif #include