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: 9709951 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 6D83560362 for ; Wed, 3 May 2017 14:55:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BC6328557 for ; Wed, 3 May 2017 14:55:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F48B2862D; Wed, 3 May 2017 14:55:41 +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=-1.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD29428557 for ; Wed, 3 May 2017 14:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yM91kOYwryoY2ecuVxv6HVQ1lyyYw94JBDm2eN+/BsI=; b=BM7HFyFxQnX6E7 CflAFM+GKIbaf4J3A1vtXFihMT5sZSvPaoaOOq0zuuR8AY+AU78xDWMpojM+9lC250avDHkQ9pkkQ /L50qR1qP6ZeRhUl1ROmIX3Z+3cTtwLZK3nl3jYYfaMhwzuMbK62ihJI4DdLs7KwDbNcydSTATMVQ rYivIcJO1ZQljp3TDxt0fEpQeKWtjWUBRdWco9fDO2nZ6BrDNcjAlWGumILjOfQmDkV1vybWGwlR0 3r5CWxfZBCt+GJ2X8FgoSBTxL4Ph6zyrPmyw0T86SOR4tSwpRRcwBs88a9RRHwA6pOcOOE1g7V9DU T51DvCc/VikA7TQehyDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d5vgp-0004C5-GV; Wed, 03 May 2017 14:55:39 +0000 Received: from mail-bl2nam02on0046.outbound.protection.outlook.com ([104.47.38.46] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d5veY-0002H4-9T for linux-arm-kernel@lists.infradead.org; Wed, 03 May 2017 14:53:22 +0000 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 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: =?us-ascii?Q?1; CY1PR0701MB1274; 23:ArjQdWbyxBlmFfwZ/r4c9ymo6WJKR634wnTBcDy?= =?us-ascii?Q?gNc93i6eMXgf8vqr3LCtnJCXAqLNucD48EZSEi7l2kMqeln64cXJ+qr5UDYb?= =?us-ascii?Q?rSU5SckCq+fkUg/qkT6mIYLxrQ0WZDZjP/QX3eR13tjquBjOuxOyaiY9GJ9X?= =?us-ascii?Q?sDXcPEzZ97XsApWfT8ZIQ3wSmHIkY224R3YLqb66UtGXqY3LeiaeyNYy9JWh?= =?us-ascii?Q?lboKCIcV1kUDjstTdFoVu4gxmXWb0ROCexrGloO0/wQBpJv+uHLvuLHVitXl?= =?us-ascii?Q?Bxj7r/k/FsPZxycdGl5cPl+yWEIxeDQyQWXWmFKEAold2bCcsn2pD14Mdh/n?= =?us-ascii?Q?liZ4HiEWCVFMWnaoAJzVgZCWYjEl7+QCoA9A+hEgcj53e9N4wwMWqeKeA7Fq?= =?us-ascii?Q?Qz1xwn4Ge/iYhlZwYHmbMSZdtm/7BNMJxO/lGYbUALg9/yQK3qTGmFhCqXnM?= =?us-ascii?Q?eVNpDQkI8+UnWFqUDTIr/eHaDj+f2+BtWLuVpw/CASIZ7Aa60fE5G7lfWtW0?= =?us-ascii?Q?830XwwHTfWQkMCjkfoNEtLHQEj4XZexVAZY61UO7j+dMT8gw8TsXYhReXRwL?= =?us-ascii?Q?YVntEWln1ktg8B4+L94Uz3DYmQNDPN9Xrykn+yiiHlyLth12mSiZuyPzxOtq?= =?us-ascii?Q?9LmbhdqLCTzjLSDvuLX1Z+k4LM7xo874y44c97UPWTs4ijstBw+7PcAxZJDQ?= =?us-ascii?Q?BzNQgURafo96FwcHthB4FIDl8PjZJRnitD0Kig97o5RaBfqLsvBoDw5VdZdU?= =?us-ascii?Q?HtyLLcuNWXHb8H2CNgTA5wObm/01NhyB/KuU9BjWkhMGpadxZjpPd4tNDQl8?= =?us-ascii?Q?qV3TWQ91kMSVZMvdPx2/kEekSsfY7m0DyWE3qnl+VqfyP9otlfK84BQMQ5vv?= =?us-ascii?Q?zqVy2aWj2wJNtKWty9FBof1kkJwjvEj1YpLtvMIz75/aNZNrMs9ZtlCoW2fK?= =?us-ascii?Q?me8jDehpSmMULbgAkuh1bh2ScxO9drg59gBsmrHeuq5wPoTpqM2DFzcUSSNO?= =?us-ascii?Q?w5C3onFqqUd/xLNA4g47CD8sARnCY2PDrEnFWpa+M7I+0+w=3D=3D?= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170503_075318_682162_AFBDCCC5 X-CRM114-Status: UNSURE ( 8.14 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Andrew Pinski , Pan Xinhui , Arnd Bergmann , Catalin Marinas , Adam Wallis , Yury Norov , Jan Glauber , Ingo Molnar 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 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 Acked-by: Arnd Bergmann --- include/asm-generic/qspinlock.h | 1 + include/asm-generic/qspinlock_types.h | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) 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;