From: Randy Dunlap <rdunlap@xenotime.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Netdev <netdev@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Andrew Morton <akpm@linux-foundation.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: [PATCH -next] sunrpc: fix stats.h for CONFIG_PROC_FS not enabled
Date: Mon, 23 Jan 2012 19:28:07 -0800 [thread overview]
Message-ID: <4F1E2547.1030206@xenotime.net> (raw)
In-Reply-To: <20120123141155.3e6b665ef655e267f25d4e7f@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
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 <rdunlap@xenotime.net>
---
include/linux/sunrpc/stats.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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,
prev parent reply other threads:[~2012-01-24 2:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 3:11 linux-next: Tree for Jan 23 Stephen Rothwell
2012-01-24 3:28 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F1E2547.1030206@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=Trond.Myklebust@netapp.com \
--cc=akpm@linux-foundation.org \
--cc=bfields@fieldses.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).