From patchwork Tue Jan 24 03:28:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Randy.Dunlap" X-Patchwork-Id: 137502 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 3947C1007D2 for ; Tue, 24 Jan 2012 13:30:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755590Ab2AXC3t (ORCPT ); Mon, 23 Jan 2012 21:29:49 -0500 Received: from oproxy8-pub.bluehost.com ([69.89.22.20]:54503 "HELO oproxy8-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755517Ab2AXC3r (ORCPT ); Mon, 23 Jan 2012 21:29:47 -0500 Received: (qmail 28987 invoked by uid 0); 24 Jan 2012 02:29:46 -0000 Received: from unknown (HELO box742.bluehost.com) (66.147.244.242) by oproxy8.bluehost.com with SMTP; 24 Jan 2012 02:29:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenotime.net; s=default; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Subject:CC:To:MIME-Version:From:Date:Message-ID; bh=PRP9ikahDHa8GHv5mVq47fsfO3rkmeDzjfZhKZrNsCE=; b=Ix23Y1VHEnT7ZzIfTMLwyW7xAVIYoSfyg2ATE1HRJd0P6IFHc/KsY4zXHKitA9ujuH6FZjoLDdG89yXKI9FHtMTuOy9ePlydhJXIgcrIBYCKUjzLnGas+q7LIfjtB6rI; Received: from static-50-53-38-135.bvtn.or.frontiernet.net ([50.53.38.135] helo=[192.168.1.9]) by box742.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RpW8o-0008Rm-PJ; Mon, 23 Jan 2012 19:29:46 -0700 Message-ID: <4F1E2547.1030206@xenotime.net> Date: Mon, 23 Jan 2012 19:28:07 -0800 From: Randy Dunlap Organization: YPO4 User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, LKML , Netdev , David Miller , Andrew Morton , "J. Bruce Fields" , Trond Myklebust Subject: [PATCH -next] sunrpc: fix stats.h for CONFIG_PROC_FS not enabled References: <20120123141155.3e6b665ef655e267f25d4e7f@canb.auug.org.au> In-Reply-To: <20120123141155.3e6b665ef655e267f25d4e7f@canb.auug.org.au> X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Randy Dunlap Fix build errors in linux/sunrpc/stats.h when CONFIG_PROC_FS is not enabled: - add parameter names to inline functions - fix placement of '(' in rpc_proc_unregister() Fixes these errors: include/linux/sunrpc/stats.h:72:63: error: parameter name omitted include/linux/sunrpc/stats.h:73:46: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'net' Signed-off-by: Randy Dunlap --- include/linux/sunrpc/stats.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -Naurp linux-next-20120123/include/linux/sunrpc/stats.h~prm_names linux-next-20120123/include/linux/sunrpc/stats.h --- linux-next-20120123/include/linux/sunrpc/stats.h~prm_names 2012-01-23 19:19:49.000000000 -0800 +++ linux-next-20120123/include/linux/sunrpc/stats.h 2012-01-23 19:20:54.000000000 -0800 @@ -69,8 +69,8 @@ void svc_seq_show(struct seq_file *, const struct svc_stat *); #else -static inline struct proc_dir_entry *rpc_proc_register(struct net *, struct rpc_stat *s) { return NULL; } -static inline void rpc_proc_unregisterstruct net *, (const char *p) {} +static inline struct proc_dir_entry *rpc_proc_register(struct net *net, struct rpc_stat *s) { return NULL; } +static inline void rpc_proc_unregister(struct net *net, const char *p) {} static inline void rpc_proc_zero(const struct rpc_program *p) {} static inline struct proc_dir_entry *svc_proc_register(struct net *net, struct svc_stat *s,