From patchwork Wed May 3 14:51:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 98494 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp95096qgd; Wed, 3 May 2017 07:53:17 -0700 (PDT) X-Received: by 10.84.218.71 with SMTP id f7mr25391405plm.135.1493823197119; Wed, 03 May 2017 07:53:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e131si2688758pfg.189.2017.05.03.07.53.16; Wed, 03 May 2017 07:53:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753826AbdECOxH (ORCPT + 25 others); Wed, 3 May 2017 10:53:07 -0400 Received: from mail-bl2nam02on0061.outbound.protection.outlook.com ([104.47.38.61]:30349 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753704AbdECOw6 (ORCPT ); Wed, 3 May 2017 10:52:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ZaTPTyvIS6dl0l3Ru0HE449Z5xIWflpryo5sIZVxT+g=; b=BssSfxqfQriVUaNI325ibi/Re+XJWprLmXkzqQQ6+KbEr5X56G+oub8ImpMhWujiaq1+6LGY7SIV7DjCXLJf/e0RfOaPm539sJL62H8DIsQUPM5iME1HIGrraD7U5U9CxshNudHUHTDDZtSwzOQknfrMlTYJQCpfYeN5VFRXLZ8= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none; arm.com; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (176.59.53.57) by CY1PR0701MB1274.namprd07.prod.outlook.com (10.160.149.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Wed, 3 May 2017 14:52:54 +0000 From: Yury Norov To: Will Deacon , Peter Zijlstra , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Adam Wallis , Andrew Pinski , Arnd Bergmann , Catalin Marinas , Ingo Molnar , Jan Glauber , Mark Rutland , Pan Xinhui Subject: [PATCH 2/3] asm-generic: don't #include in qspinlock_types.h Date: Wed, 3 May 2017 17:51:40 +0300 Message-Id: <20170503145141.4966-3-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170503145141.4966-1-ynorov@caviumnetworks.com> References: <20170503145141.4966-1-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [176.59.53.57] X-ClientProxiedBy: VI1PR0602CA0021.eurprd06.prod.outlook.com (10.175.26.159) To CY1PR0701MB1274.namprd07.prod.outlook.com (10.160.149.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b1a1e2f-541b-4e0e-0dcb-08d4923414c0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY1PR0701MB1274; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 3:51ExR/spmDaVpeIe3kc3T1f9o3ha2dYocVEFDZ8BUXBDSKyaEP+nXFkkVP1ybUdVDZb51Lam0maPvyyYY4OatqUOQ6FskYl/7xELnVUHmLncoufYWSavCuMoUBjNUpxtTqHt5YueUCJgo669ewV2+GUk4FKLMo8kkWH85PKDjvqAS0rSb290C2hKhWS9+LJSResChb/YxQ9UQZpUISO+FCI9RIfeJW+Vpm48xTZYb0kOupW3SUO9hEEaAxZmenbjQBWTDtQYU8INFgfn8iRWXlZsFjm9A2OmQJSHDe1zvEiSvKKtajzra9S9IP2k1SH1UIM1GWzJF44lR8L6PMQjGg==; 25:GwzvntPHgPCR1V7W1C2UUz5CaJCjedCBiYEv7p9Z2jXPhhhVnZXm/FRkssvOteJ9lIAL1bK7PxYSejdMxpbJ67n5OErcLvD1p0qNVvH55NAfFEP98sQPkuq53oUBqGmF+BDVBF2I9a2dE7oxwPJtn1FGdbdcUS9DpfzS/gFTjA6zhSY1jtdZsPhGbHS8NyRCIJ2j+YfeH3qiKrg3nEIFV2QstJKXQNl7FTj8eQTmewzBLyXogTh9lEd1+jWNIgvhoqqnVFrA2lD8bwJn5Qi7rybxrimh2pKmbVv9aj3XuN2JFv28zygJjSlU0k3DT8TzoDF9UoA+pMBmjreceT9bBUhOFQhJS9C3SX9t8x24DKUrK3bKk88rIAWAtGRmpN0gZp5OMvpXB2EOLHgaN2cXPNYf1jYtPB64ntDttZ2/34uzJLJgGeSPzfiUuGMxjZl1PKIBiE9A2AqHzJxQdHMHcA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 31:5PuPkvLy8Iep68aS2z+6IH4vtDCTK8UCp2gIqIotG9mK61jgXb0pazX8fUpvqasFJV2yzow0ZyeXyRSEssmnPL75FBjawvZRT2pIR6sIp5fa3o8hJS9tMITN8RCBSTIPNK3JlSABd1oywVVhazJ4IGKIg7lpImN237lSUlSzsUAEYWFGZc14IoDFoMOfOYC3xH4/dikV53LRjocnIAiGkY/whbDRyTB0sckEmA5rQUPZsmGU2bRDUTxnNl/gXLgR; 20:cj5aKf5iSQRIHJqp78hAhiAbM5fSLGlBlhU6qij2vZqK1O1LVDg4PvrpL9MfRlkbrBV2ZiGGPprOQlYbI+Q+FHT3zZy3PO9cSkapWycQlw6SMeZ2A3wGwuL+cK4+T+znqwR/9QPE559y6t4BZ73Hv1I1DbJ5RCKanAdJGw1wvw5OkuZvT0/3NbwgTLlyvEkyrwMBxA1jmNe+1VBVneEZqE7UjQhixn+K0gM5jxbgO7v2iK/Ns0GuEMcW6SAoJzH9SSI31Jer518e6zrqpANPd33uTulA0t2a+m4fNgB7gcZA04/xuVGq/j/m5ulZkYIox+YZvhd7IIG+FHVj6h+GB9Kc2B+thWvxLBruHGKGuF9s+ChHf3oMXmR2TawUdC6HbmsPahSc1T9Br++FquvoYvf9fTI+7uPMnYOeq2UCvkN0O0LhByyJGhu2C8hQ4hZHazrnvCYR++oAyShqQCo3ZGK+wvLkVZS3URBEd7vYK/544TA5/PBg+WV4xQ0+t0m9eDf6GguglBsQV5cOGg6NBK0W4f92Vo8T/7O2Ir9TL/cfvUCLCuzLGsasdGe2kWGl6QpyxvAPC6a+/lFzR3p4ivyJlILdQx2+K3l+nzaKfgs= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(10201501046)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:CY1PR0701MB1274; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1274; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 4:5oIEYQ8nSVjgZHQHc1T09nD33DXNgRfc87G1aVsQZ8HoQIxw7lJg/KF++4JZP4IEQCCI825yO8scmHQSQEcpZWv3ATQEvpEbv5xFvS3GKtt+ZzAMJUXjKRzIXIdpxh4rNU7453U8A9JlExOtItd4JIq7EvF00yqlr8chK97OHd8fW27MQ5FMWiRdreg5WQU/achDxSzOMzVNMXWt1CFmZ4uKfPduUhw8+qDGDrg2BVFK/Mb/wNpx1SfyQ54A56Eo+QISKNkF1hBcEY2x3m/JtmAJj1uZrLtDT+mUwy6kcrmYjpRwOlx8KQ45jujIEycNHD0ZQIJxbYXP2MlHny0rFqFfDvZ0OrtnSM7eQ+Snytb6LPzX3+8Y98omfieu7iF52ASz5RJw/3DGjeDmODaRurRXnSNpjwRaPZ+QewOIGknt5kiitkuLbzQS1ut+bR05uvNXg7ezCw9P/Ge8T+I/gVL/66jbIIA0oRjljH4+X48XBViKXbZpg/4Yl+5ENhs0OD9MilRAhiAcGmbJaQlENtsUaTFMmgaR8LD83M1u3QpEhR+1JwG+N1E6JaayA4te7YybC34YW+P2umFQdrDnEUBtPNrgUgKA+GqiA3IlCietofGEzSos+zvcV8JkwC2klfPax8WysVxnK0rR2TjatJAlVFD0p1cWeULeObH5pcCkpKYTUWyc3TVtwv84p0SC X-Forefront-PRVS: 029651C7A1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(39400400002)(39450400003)(39850400002)(39840400002)(6496005)(5660300001)(6666003)(3846002)(36756003)(2906002)(66066001)(575784001)(33646002)(47776003)(2950100002)(42882006)(6116002)(7416002)(38730400002)(4326008)(1076002)(508600001)(50226002)(6486002)(305945005)(50466002)(5003940100001)(53936002)(48376002)(8676002)(81166006)(50986999)(25786009)(42186005)(76176999)(7736002)(54906002)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1274; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 23:ArjQdWbyxBlmFfwZ/r4c9ymo6WJKR634wnTBcDygNc93i6eMXgf8vqr3LCtnJCXAqLNucD48EZSEi7l2kMqeln64cXJ+qr5UDYbrSU5SckCq+fkUg/qkT6mIYLxrQ0WZDZjP/QX3eR13tjquBjOuxOyaiY9GJ9XsDXcPEzZ97XsApWfT8ZIQ3wSmHIkY224R3YLqb66UtGXqY3LeiaeyNYy9JWhlboKCIcV1kUDjstTdFoVu4gxmXWb0ROCexrGloO0/wQBpJv+uHLvuLHVitXlBxj7r/k/FsPZxycdGl5cPl+yWEIxeDQyQWXWmFKEAold2bCcsn2pD14Mdh/nliZ4HiEWCVFMWnaoAJzVgZCWYjEl7+QCoA9A+hEgcj53e9N4wwMWqeKeA7FqQz1xwn4Ge/iYhlZwYHmbMSZdtm/7BNMJxO/lGYbUALg9/yQK3qTGmFhCqXnMeVNpDQkI8+UnWFqUDTIr/eHaDj+f2+BtWLuVpw/CASIZ7Aa60fE5G7lfWtW0830XwwHTfWQkMCjkfoNEtLHQEj4XZexVAZY61UO7j+dMT8gw8TsXYhReXRwLYVntEWln1ktg8B4+L94Uz3DYmQNDPN9Xrykn+yiiHlyLth12mSiZuyPzxOtq9LmbhdqLCTzjLSDvuLX1Z+k4LM7xo874y44c97UPWTs4ijstBw+7PcAxZJDQBzNQgURafo96FwcHthB4FIDl8PjZJRnitD0Kig97o5RaBfqLsvBoDw5VdZdUHtyLLcuNWXHb8H2CNgTA5wObm/01NhyB/KuU9BjWkhMGpadxZjpPd4tNDQl8qV3TWQ91kMSVZMvdPx2/kEekSsfY7m0DyWE3qnl+VqfyP9otlfK84BQMQ5vvzqVy2aWj2wJNtKWty9FBof1kkJwjvEj1YpLtvMIz75/aNZNrMs9ZtlCoW2fKme8jDehpSmMULbgAkuh1bh2ScxO9drg59gBsmrHeuq5wPoTpqM2DFzcUSSNOw5C3onFqqUd/xLNA4g47CD8sARnCY2PDrEnFWpa+M7I+0+w== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 6:i4F70fBKLTgfX8Kk/QnAcMh8R4PUPplu0useSJfmyEqcqVQ56hIL6j8FYUVt8DKdgW3PnlYd8nyHn6woMyw9uNTfnziIU43kgRaTq1XCtxq4XpTkryrz7TAbNAspNxp7gHSk31DmyX6cXul7Ew4COZW6N1eOAeKCMHvqUkmeuPHIbWot/xKAjSzrQeEE/l5NkREO6ZkMiaDJG4gJkf8L8eN3y+tpLlMCD2ZQcK0plMkXc9OqupXTFE9FdxIwCRRwv6KkXFAiFkomNPOMlOUaqCPW6l+voXbd/Crjtt3mWkW62uI8rkvSnSed/G9nFe5MBGw6TfRZb1DI4uJpdO6f4UQfEbeFR2oAOkkxj3RV6Gdkm9XqD5tl46BuaVfhOJ3iLhdf3hqvvJvq++j18IZJoOL3/A47RMVFeImvrqmQ3B08/IfLr8qd60Dl1subQ1ibCSlA8ouKi6ph5kGlT12N9dnmCgCQL9wTp2qpR/ymJeURVnEH7azIyhHg+Edk53V3x6WlY2/i/fuLBDtJ0abHXw==; 5:x+Ynbi7ZyNimTqBarV9LwtRA6FGfm2iYrSez/tqm21fR8qiAlumvgInm4qHisom/O7UmOeCVuXPUzqCuO2lo443rHmsIjpwh5Ktio4SiHoKwUVenhV3eUZ5G43muHfaVsHJF4KxqbRu2ml/N3rq2ow==; 24:0Dfu2rM/1I8QHw2FazFWjxt4h/Xtiaq74cslSJgfeM3MzK1tTPb8wFzBriBuQEFtzGx7SA698Z1DWruOG1kepOR+kwD/IWas92QopNlKGFA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1274; 7:+1FaD2xXhes1POmuujO7mCJEuSI0ImA064e3Y9zmWV9QZAC9sHnaU6HinL1S78i1nn1H1SUPHOQBGo9kE/lRcblD//syVcAyFZm4EpZdrMu9z2KdCirZFevkA2apTlNGZXuEq9ezuaC99hX2FFPMMfCF2pBdiSZF9erxxLAm8jmPUx+NJ2GB9R1UCcmVA4OGxTxuCDLDovpPHZc9Hy6nQhvXMn694RiVTdluHudMhPhtWf0eauAJDOfetyrF8sc7WNpCJ9/Yvtkk4FPmhJ9KMrAIzIpxNDfj/CLLrGFOLXVT5YBK4oRmFzS0y9qr7vQR7OXl0dXX3NxmWnmLcCgy2g== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2017 14:52:54.4063 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1274 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The "qspinlock_types.h" doesn't need linux/atomic.h directly. So because of this, and because including of it requires the protection against recursive inclusion, it looks reasonable to move the inclusion exactly where it is needed. This change affects the x86_64 arch, as the only user of qspinlocks at now. I have build-tested the change on x86_64 with CONFIG_PARAVIRT enabled and disabled. Signed-off-by: Yury Norov --- include/asm-generic/qspinlock.h | 1 + include/asm-generic/qspinlock_types.h | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) -- 2.11.0 Acked-by: Arnd Bergmann diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 9f0681bf1e87..5f4d42a09175 100644 --- a/include/asm-generic/qspinlock.h +++ b/include/asm-generic/qspinlock.h @@ -20,6 +20,7 @@ #define __ASM_GENERIC_QSPINLOCK_H #include +#include /** * queued_spin_unlock_wait - wait until the _current_ lock holder releases the lock diff --git a/include/asm-generic/qspinlock_types.h b/include/asm-generic/qspinlock_types.h index 034acd0c4956..a13cc90c87fc 100644 --- a/include/asm-generic/qspinlock_types.h +++ b/include/asm-generic/qspinlock_types.h @@ -18,15 +18,7 @@ #ifndef __ASM_GENERIC_QSPINLOCK_TYPES_H #define __ASM_GENERIC_QSPINLOCK_TYPES_H -/* - * Including atomic.h with PARAVIRT on will cause compilation errors because - * of recursive header file incluson via paravirt_types.h. So don't include - * it if PARAVIRT is on. - */ -#ifndef CONFIG_PARAVIRT #include -#include -#endif typedef struct qspinlock { atomic_t val;