From patchwork Sun Aug 25 07:15:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 269686 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 4EAF42C00FA for ; Sun, 25 Aug 2013 17:17:47 +1000 (EST) Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail.windriver.com", Issuer "Intel External Basic Issuing CA 3A" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 3D7DD2C00C1 for ; Sun, 25 Aug 2013 17:16:56 +1000 (EST) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r7P7Gneu014378 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 25 Aug 2013 00:16:50 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com (128.224.162.196) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.347.0; Sun, 25 Aug 2013 00:16:49 -0700 From: Kevin Hao To: Benjamin Herrenschmidt Subject: [PATCH 2/5] jump_label: also include linux/atomic.h when jump label is enabled Date: Sun, 25 Aug 2013 15:15:49 +0800 Message-ID: <1377414952-15995-3-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377414952-15995-1-git-send-email-haokexin@gmail.com> References: <1377414952-15995-1-git-send-email-haokexin@gmail.com> MIME-Version: 1.0 Cc: linuxppc , linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The struct static_key will have a atomic_t type member no matter whether jump label is enabled or not. We would include linux/atomic.h when jump label is not enabled. But it also does make sense to include this header file when jump label is enabled. Signed-off-by: Kevin Hao --- include/linux/jump_label_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/jump_label_base.h b/include/linux/jump_label_base.h index 20df08f..d5c8f4b 100644 --- a/include/linux/jump_label_base.h +++ b/include/linux/jump_label_base.h @@ -5,6 +5,8 @@ #include #include +#include + #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) struct static_key { @@ -77,8 +79,6 @@ extern void jump_label_apply_nops(struct module *mod); #else /* !HAVE_JUMP_LABEL */ -#include - struct static_key { atomic_t enabled; };