From patchwork Fri Mar 15 16:50:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 228095 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C9262C018F for ; Sat, 16 Mar 2013 03:52:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754967Ab3COQwA (ORCPT ); Fri, 15 Mar 2013 12:52:00 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:41279 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752232Ab3COQv6 (ORCPT ); Fri, 15 Mar 2013 12:51:58 -0400 X-IronPort-AV: E=Sophos;i="4.84,852,1355068800"; d="scan'208";a="6880049" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 16 Mar 2013 00:49:29 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r2FGpuOl003845; Sat, 16 Mar 2013 00:51:56 +0800 Received: from notebook.8.8.8.8 ([10.167.47.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013031600503792-911418 ; Sat, 16 Mar 2013 00:50:37 +0800 From: Lai Jiangshan To: "Paul E. McKenney" , Andrew Morton , linux-kernel@vger.kernel.org Cc: Lai Jiangshan , "David S. Miller" , Cong Wang , Neil Horman , Eric Dumazet , Jiri Pirko , netdev@vger.kernel.org Subject: [PATCH 4/9] netpoll: use DEFINE_STATIC_SRCU() to define netpoll_srcu Date: Sat, 16 Mar 2013 00:50:52 +0800 Message-Id: <1363366257-4886-5-git-send-email-laijs@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1363366257-4886-1-git-send-email-laijs@cn.fujitsu.com> References: <1363366257-4886-1-git-send-email-laijs@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/16 00:50:38, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/16 00:50:38, Serialize complete at 2013/03/16 00:50:38 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org DEFINE_STATIC_SRCU() defines srcu struct and do init at build time. Signed-off-by: Lai Jiangshan --- net/core/netpoll.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index fa32899..a3a17ae 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -47,7 +47,7 @@ static struct sk_buff_head skb_pool; static atomic_t trapped; -static struct srcu_struct netpoll_srcu; +DEFINE_STATIC_SRCU(netpoll_srcu); #define USEC_PER_POLL 50 #define NETPOLL_RX_ENABLED 1 @@ -1212,7 +1212,6 @@ EXPORT_SYMBOL(netpoll_setup); static int __init netpoll_init(void) { skb_queue_head_init(&skb_pool); - init_srcu_struct(&netpoll_srcu); return 0; } core_initcall(netpoll_init);