Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265AbdDJVfh (ORCPT ); Mon, 10 Apr 2017 17:35:37 -0400 Received: from mail-bn3nam01on0081.outbound.protection.outlook.com ([104.47.33.81]:12923 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752940AbdDJVfd (ORCPT ); Mon, 10 Apr 2017 17:35:33 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=caviumnetworks.com; From: Yury Norov To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Peter Zijlstra , Ingo Molnar , Arnd Bergmann , Catalin Marinas , Will Deacon , Jan Glauber Subject: [PATCH 2/3] asm-generic: don't #include in qspinlock_types.h Date: Tue, 11 Apr 2017 01:35:03 +0400 Message-Id: <1491860104-4103-3-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491860104-4103-1-git-send-email-ynorov@caviumnetworks.com> References: <1491860104-4103-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.118.90.188] X-ClientProxiedBy: DB6PR0501CA0033.eurprd05.prod.outlook.com (10.168.78.147) To BN3PR0701MB1266.namprd07.prod.outlook.com (10.160.118.140) X-MS-Office365-Filtering-Correlation-Id: 279059b2-8f44-42c0-b07d-08d480598420 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:BN3PR0701MB1266; X-Microsoft-Exchange-Diagnostics: 1;BN3PR0701MB1266;3:Bdjel7H1mkprleTCdTQrT/Zu1FUyaaHVIkazdn2hpA0GkkgVGTv127pMuCJ3bH9WH3Av62+7+EsGEQbZ4fnCAp+rNwcVSMn+HXXShGER9u+dv9yw0H4OXLfEYfPJDL2Q/QeL3pomrRSp0id7avKxZ9/A8kDSiSqz0icavEdQI9V3J2ntNkmqV8bO2E9aCBEdlhwMlv8z9wwPv7/5CcbInTj/CaOogCeYYJbDCpcVA0yzQxD1Sw7V7BGpN3Lcjq3mbPxwbQKnVC8uFqEdDvbM1kBRhyNzuts8UoFHfEnlFllGxnYUdwoSCUK6A9u1E7YNJ2ZOsKdTMPZnJUcvcE/EhA==;25:/H963QmW6UsLgBAN/hOnHIBl4pe2n3Hvo5FeeiATE6qQwhcaMEb1x87MsScYPUWLHdqEonOXqSQgXHfzzkehsoN+FYUPsJPhfeaTPoJCMVl0nzAxDiI9g8jzrFl5D2g09MnX6joy3M6+8bnNpMem27vGnbH51dTDAAQtkdKzZRjkuaWSy0OWoMAQKQIPd+7TyO3f1aLHWHRVJMUwRVFgpw471+28dMkmaNvVie8Wsg/FEU1nEjH7Ljaf4n72sZiwZl/l3UP8sunJh2RTpdI7abhJBjL2sDX+vF0Ut08eIl2fA/qMZl5La1+Ib1OYSvErUJD/0zAd20vqti7c9Imdsr+00d4SHoiuKXYJCD18BzsfpZBn97c0k1VsHLKh+6SchdniJL18wtExMdNdYcpV5Tbw49WRYAyEsuZDXLlQIi4DCW8Foe09EQwXYw2JNTTr/p+Y+ZtKAlvOa+JH2I9K2Q== X-Microsoft-Exchange-Diagnostics: 1;BN3PR0701MB1266;31:gqgaIhiGilMykIe/Z2jSGaih707JesVWD6pVSABcVTb6fmcIl89GfxWk1JjdkwutNyfysA3KlfV+8BOY4zhmqfE26vUGe5tYqAhrmNqhv8JtMpnBb0CEOn9aMEs0nirV1XrutGm25iwN8MIBH9qskaMLpn0yAtaVOGbWhLx29VqUdLEdlCwvrAKg34ztbbgQ7JVQYTeiR38ZRXImipMsFTeXXE1/sYufqRlQM2odLHcoZVAIsluXFJp0VkWMpNqL;20:D3o91IqoN6NeI6J8aJpo3Ey9z+VolNTbgxOmkeduUddMDIzcxJmS/hscCMdgw4CbkoTh/oe+49+UxiZ17FGZ3dTJzSOaJOr4h1gH9lM2XMMnCty9HCvFnqyApWd8mERU0Vz6JNOX94FuSj1WBXu8391FuYEL15uM/xFyZC/aV20xpu682oSLPLOgId7P5tfzQImeGIVjHbEUGL17OCb3UT8QxZi0q6aMk1q5vLbqlv7jGxKOQFY6dX0P7pfyPUYBDHQdme7ds5ldJOv+VLVAPPZQ5PeUoR0JjiU+TjJeYw9QXhFfyBQ2X6QgjU6RXBP7bcgtMzcDJszS7Xq6aMRbs1vY5FOTh7RuR9/LnGCaSLMZAylRY3d54ZKjbM0EBpPCzYSVYnyJVe+907IfEY5aKgWm66riAJiKbSpviWdlqP1EfKPaf/+oX3DZR3Q8oKz/vER/ZyZzftFShMt4mHkkYqlrakxrghqTLDkVbi3pfZSonn7scYkbEExTO6wEY2P80yKHh9Xwlvz0xfd0uDj9lkMypsb5pqr61c5rRk9BwYPQkLupQ82ld95Pdx+kHHAU9yUhfAJgwKDw4XwfRtaBA/afRnaD4QbAWkMK3iEDsqY= 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)(10201501046)(93006095)(93001095)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(6072148);SRVR:BN3PR0701MB1266;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0701MB1266; X-Microsoft-Exchange-Diagnostics: 1;BN3PR0701MB1266;4:pKC7pmfKaXmGu3/qliaAw2LTBkKGKqV13BV52qbZzYPuEWD0wRHIzr92fEFCjrZilUhI31nCRuXsHpgz7WUjzStYpo/psMq2NAe4A/kWn050AsAUhyU5WjmZSYAYlL+PtofJTP8rqQ9mSMYB7XEV8WSY3uVuZ91T2WLWaj/t3FHWCFodSSY93aDNVzN55w3TKS5IugDlamyh5qeZeNWITg6k21lz28XFynPDb+gZoaU/KJ9KzPOlZ5Xc5fHqrNLX9QKp18ta+qXzAH7usiFTS4/03fVt0H+cgI+vmclYv95Eke1ulICEfCtZkVBwupjFi6MeEdeOYUIW5YoSGvD67DDqPFAKiyM/9mmAD3xELPhjxMoCBfwOhReLqDGvlYE6hA9TB3SnGq33XBbtwqrOcLLFdkZrqGbVl8eTeVPjwnKAL8GK9CcT9/MnIuZrz0bHK3sWuwjaxFd3Fr/Cl3j/dZa2KfAAXESx/ndsw3N0SZaxYBsBUvL0epHUlPe/ELU0bpipxxIDK2oJ81WOHy5x/ipqHqF2gjUmFYig764FWkFA17Ns+Cjdk+RFua40Sk21mzepXvPvEhcPEzC+saNqeKfEx2t1VPXpE4KihP+1g+Yyk6r92uECQzbafCUIjmEOOKd8tOr2hurwb4eADOuSt0LP99dW4Z24enS+/cHfBWhCPq+CdeMgHbojjJH2ugEoLMWSpYPbVJB9WTkLxlxQBg== X-Forefront-PRVS: 027367F73D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(39400400002)(39840400002)(39410400002)(39850400002)(39450400003)(5003940100001)(66066001)(189998001)(25786009)(3846002)(53936002)(42186005)(38730400002)(110136004)(107886003)(47776003)(5660300001)(4326008)(36756003)(54906002)(2950100002)(50226002)(6486002)(2906002)(8676002)(7736002)(33646002)(50466002)(48376002)(305945005)(6116002)(81166006)(76506005)(6666003)(6496005)(50986999)(76176999);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR0701MB1266;H:localhost;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR0701MB1266;23:fn8DmWDSPkCCmE7W7dy9hhqRkvmxmcCcXpue8r9?= =?us-ascii?Q?/5zeaKHejAT8vKfB2QMVgQ5CXpaeARRL05/246iAC9ysHssOU2dY4gNTRxXc?= =?us-ascii?Q?Y9W9VpdaCb4k7HcGCaFQhhG/oI4tGiyoALQRcNS4otvd7NSJ1XRfeDf8+Rge?= =?us-ascii?Q?icBs02Tozfe7eOZNFGuRKrWl/9gQK+1dZG1xT1G0fhnx7UesX2Gmp1hcURwV?= =?us-ascii?Q?zxVuBS5WxiexM4FeCyIIxXqq0noYt68FccRx4s3YjgNyS8lxMDhHcUngj0S8?= =?us-ascii?Q?liGLURj24+S/2X4pPwMqSYt1okTOUrkv4m3KgG7tYZDfHPTjcbtkGwlKZL7i?= =?us-ascii?Q?4YDEuACB0HDGxlxqEaygnITIYicE6+LjB4qcq4EDc+CTd3Rrld7HK4hNusi+?= =?us-ascii?Q?BDuEPxndJb8wBnCpFVhOPSAPW/1FGxjikWU5oHp8qtCBUKEJiV2WPjA8M/MD?= =?us-ascii?Q?tPLQKAo39oprzXJTa6Alg+vOgeo6CYQDr2lKcm9QmZFDk/W3wFThFnTsMQXp?= =?us-ascii?Q?RRJ8O5N52+Owr7qngpX9WKj9MvfwP7vVD6ColVv2jAbW2gHWOtcQCo0P/AU6?= =?us-ascii?Q?b1OhuAtlUQo1zduN3P2o7WhQDpFbpkoZCQa4CTPYQK5/QAnWONVW3+Od26Ib?= =?us-ascii?Q?XTyz8DjejtIN9AHhON1QOWSIfX1ZXG6dNbeJ6oeDHTZY8lod+F1jQkxcC7uD?= =?us-ascii?Q?nmdrKb9KXGcYmZtSCal2RDSIC2K2Xt4JkIGjCi32GaFvuc2Flwqq3sdNiXxF?= =?us-ascii?Q?9xIBjtp8Ut74kdTuIt2clbtKwluT6pCkQLgBLarUJ4/IU9H6319IRZVuvNCy?= =?us-ascii?Q?doCy1DsqmPdR3cUvek5tMFLTm4umtqecUo6kTqGCIH8IPk/FUwGUC046UUAC?= =?us-ascii?Q?UsdsG18IYLHDGp+gdgBSI4wp1hmqEs58BOso0T1Mbdgi2F7TTV1dIgylAGAS?= =?us-ascii?Q?ETH86L5GODG8Ci3GCBRtQSQN1EFQhNABJ0+nPSWXlaAdoH/gzj8adDJMQlLo?= =?us-ascii?Q?3Pd4DEOpf3zAhjxhHpuzoomB/AT30oY4y4kMpZUkXSCInGw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR0701MB1266;6:yeMdHTS6FFoG4BLQ9OKqGv1ZoEICYi631KNb0MKSlXBepITzc+B4MxJ43qz02x3zp99ClzmygkE45ZKEW0I5FegJ4rm4tJ9AWthM7Dc1IR0vG9bGRUrk8/OER4m9hPExafLAk7LvZVPlEPSv8pZoUgXrSeesXokVdeEUgWyVqk4mAO0yKZmvqngOkeHxrIcH808BAPUd/LakLj7XuzAcSLwd1xcY3lW7SPqRdt/HWD/5RyihCqzvIbtB3pz8Hl1Yg33S5p80NF+MGccQKIEYW3qqUW35YEX2ZffBxLS6VVBBpkhqy1XtoxvIMeGEiHO4nUkNSaV0zR33uI+F2SVmW2oWEz/3FG7XbuSz0hWpWhfIyQungGwdzlz+GzNLH4Fej8KcbIJ6tPyjvl2MrsqCEvfOxKpVYKLjT+PVf9QRWzBI+dcHt2qcUAAF8Vae4Uh2YH2PD5OjFixXXYZuLlHFwQ==;5:QXBGcOUFGDERDGtgnRW/VUPb1Iq0PrK86VffK+GITiJOgqKjItbMPlstMYCtcRnzzxPIK1Uy9XaCkL75y7xy5dSv0h3/RDRI7LD7u7eQ0GSeJ9CN5iWbxWir2xk3WIhVxSfQ2+mf3LdiVzHJihNFRg==;24:2InQNpRvz3YcCpWME7Exvrd8uMReDGmD2Ra2MWqa43DbxN0BDKzXC9UaR4PdZzW6UoFlgpFbZjwYZzowd2hypbJXvJyKMG43sIlbCGrpHqo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN3PR0701MB1266;7:KnZ2id7tRsHotgg5BMstOsba1isb9oUuDX/ZvBE9xi2UPoarzh/EmhDE8r9k7mTu83NStu0o9iLUxm+GutQxDh8NPK5UZTIg6EZu7oJgKG1F1osSG7EbnsXmwnPKPm0sSopkmQ8poAfQx2/NTZCtqdEfqEwUFsAHp8kcs/VAgFshZEJ/3esMxt4VkcJUO6PMqmvE+c9Uryuqz/p3lOewmFt39Gc8q76Ws6sEI1qaFJFjBO3TfjkTOup1jaB9f/OKWADyD2FG3SJmasz0sfxqn3sKbCPEWg0+/iH0jv8TRt0YtGjUHbnrJf5FUQ/DLmXA7SgfRmzBgyny/6aXGiqxog== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 21:35:31.8887 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0701MB1266 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1644 Lines: 47 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(-) diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 9f0681b..5f4d42a 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 034acd0..a13cc90 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; -- 2.7.4