From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, trond.myklebust@fys.uio.no
Cc: linux-kernel@vger.kernel.org
Subject: [-mm patch] fix nfs PROC_FS=n compile error
Date: Sun, 26 Mar 2006 14:25:15 +0200 [thread overview]
Message-ID: <20060326122515.GJ4053@stusta.de> (raw)
In-Reply-To: <20060323014046.2ca1d9df.akpm@osdl.org>
On Thu, Mar 23, 2006 at 01:40:46AM -0800, Andrew Morton wrote:
>...
> Boilerplate:
>...
> Changes since 2.6.16-rc6-mm2:
>...
> git-nfs.patch
>...
> git trees.
>...
This patch fixes the following compile error with CONFIG_PROC_FS=n:
<-- snip -->
...
LD .tmp_vmlinux1
fs/built-in.o: In function `nfs_show_stats':inode.c:(.text+0x15481a): undefined reference to `rpc_print_iostats'
net/built-in.o: In function `rpc_destroy_client': undefined reference to `rpc_free_iostats'
net/built-in.o: In function `rpc_clone_client': undefined reference to `rpc_alloc_iostats'
net/built-in.o: In function `rpc_new_client': undefined reference to `rpc_alloc_iostats'
net/built-in.o: In function `xprt_release': undefined reference to `rpc_count_iostats'
make: *** [.tmp_vmlinux1] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/linux/sunrpc/metrics.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- linux-2.6.16-mm1-full/include/linux/sunrpc/metrics.h.old 2006-03-26 00:05:50.000000000 +0100
+++ linux-2.6.16-mm1-full/include/linux/sunrpc/metrics.h 2006-03-26 00:13:46.000000000 +0100
@@ -69,9 +69,21 @@
/*
* EXPORTed functions for managing rpc_iostats structures
*/
+
+#ifdef CONFIG_PROC_FS
+
struct rpc_iostats * rpc_alloc_iostats(struct rpc_clnt *);
void rpc_count_iostats(struct rpc_task *);
void rpc_print_iostats(struct seq_file *, struct rpc_clnt *);
void rpc_free_iostats(struct rpc_iostats *);
+#else /* CONFIG_PROC_FS */
+
+static inline struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt) { return NULL; }
+static inline void rpc_count_iostats(struct rpc_task *task) {}
+static inline void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) {}
+static inline void rpc_free_iostats(struct rpc_iostats *stats) {}
+
+#endif /* CONFIG_PROC_FS */
+
#endif /* _LINUX_SUNRPC_METRICS_H */
next prev parent reply other threads:[~2006-03-26 12:25 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-23 9:40 2.6.16-mm1 Andrew Morton
[not found] ` <6bffcb0e0603230631r5e6cc3d3p@mail.gmail.com>
2006-03-23 14:49 ` 2.6.16-mm1 Russell King
2006-03-23 16:11 ` 2.6.16-mm1 Michal Piotrowski
2006-03-24 11:28 ` 2.6.16-mm1 Roman Zippel
2006-03-24 19:59 ` 2.6.16-mm1 Russell King
2006-03-28 9:18 ` 2.6.16-mm1 Roman Zippel
2006-03-23 17:58 ` 2.6.16-mm1 Dave Jones
2006-03-23 21:37 ` 2.6.16-mm1 Andrew Morton
2006-03-24 12:09 ` [PATCH] use select for GART_IOMMU to enable AGP Roman Zippel
2006-03-24 12:13 ` Andi Kleen
2006-03-24 12:45 ` Roman Zippel
2006-03-24 12:51 ` Andi Kleen
2006-03-24 13:49 ` Roman Zippel
2006-03-23 21:07 ` 2.6.16-mm1 J.A. Magallon
2006-03-23 21:11 ` [PATCH] Make __get_cpu_var use raw_smp_processor_id() J.A. Magallon
2006-03-23 22:35 ` David S. Miller
2006-03-23 21:12 ` [PATCH] Use const* parameters in mm.h J.A. Magallon
2006-03-24 21:35 ` Andrew Morton
2006-03-23 21:13 ` [PATCH] Lower e100 latency J.A. Magallon
2006-03-23 22:33 ` Jeff Garzik
2006-03-27 20:30 ` J.A. Magallon
2006-03-27 20:57 ` Jesse Brandeburg
2006-03-23 21:15 ` [PATCH] Dont build altivec raid on x86 J.A. Magallon
2006-03-23 21:22 ` Brian Gerst
2006-03-27 20:28 ` J.A. Magallon
2006-03-23 22:51 ` 2.6.16-mm1 Rafael J. Wysocki
2006-03-23 23:42 ` 2.6.16-mm1: CONFIG_HOTPLUG_CPU compile error Adrian Bunk
2006-03-23 23:53 ` Ashok Raj
2006-03-23 23:55 ` [RFC: -mm patch] remove drm_{alloc,free}_pages Adrian Bunk
2006-03-23 23:57 ` [-mm patch] drivers/video/intelfb/intelfbhw.c: make struct plls static Adrian Bunk
2006-03-24 0:00 ` [-mm patch] make drivers/char/ipmi/ipmi_msghandler.c:ipmi_find_bmc_guid() static Adrian Bunk
2006-03-24 0:02 ` [-mm patch] drivers/char/ipmi/ipmi_si_intf.c: make a struct static Adrian Bunk
[not found] ` <200603232317.50245.Rafal.Wysocki@fuw.edu.pl>
2006-03-24 0:04 ` 2.6.16-mm1 Andrew Morton
2006-03-24 0:17 ` 2.6.16-mm1 john stultz
2006-03-24 0:38 ` 2.6.16-mm1 Rafael J. Wysocki
2006-03-24 0:49 ` 2.6.16-mm1 john stultz
2006-03-24 1:04 ` 2.6.16-mm1 Rafael J. Wysocki
2006-03-24 1:12 ` 2.6.16-mm1 john stultz
2006-03-24 1:23 ` 2.6.16-mm1 Rafael J. Wysocki
2006-03-24 1:28 ` 2.6.16-mm1 Andrew Morton
2006-03-24 3:47 ` 2.6.16-mm1 Andi Kleen
2006-03-24 2:17 ` 2.6.16-mm1 Brandon Low
2006-03-24 2:24 ` 2.6.16-mm1 Andrew Morton
2006-03-24 2:45 ` 2.6.16-mm1 Brandon Low
2006-03-24 2:58 ` 2.6.16-mm1 Andrew Morton
2006-03-24 3:21 ` 2.6.16-mm1 Brandon Low
2006-03-24 11:39 ` 2.6.16-mm1 Andrew Morton
2006-03-24 12:58 ` 2.6.16-mm1 Brandon Low
2006-03-24 18:33 ` 2.6.16-mm1 Andrew Morton
2006-03-24 18:37 ` 2.6.16-mm1 Jens Axboe
2006-03-24 19:15 ` 2.6.16-mm1 Brandon Low
2006-03-27 10:58 ` 2.6.16-mm1 Jens Axboe
2006-03-27 16:24 ` 2.6.16-mm1 OGAWA Hirofumi
2006-03-27 17:15 ` 2.6.16-mm1 Jens Axboe
2006-03-24 11:56 ` 2.6.16-mm1 grub oddness Mike Galbraith
2006-03-24 18:25 ` Andrew Morton
2006-03-25 4:55 ` Mike Galbraith
2006-03-25 4:53 ` Andrew Morton
2006-03-25 5:14 ` Mike Galbraith
2006-03-25 12:44 ` Mike Galbraith
2006-03-26 9:10 ` Mike Galbraith
2006-03-26 16:01 ` Mike Galbraith
2006-03-26 16:47 ` Mike Galbraith
2006-03-26 12:25 ` Adrian Bunk [this message]
2006-03-26 12:25 ` [-mm patch] BLK_DEV_IO_TRACE Kconfig fixes Adrian Bunk
2006-03-26 12:27 ` Jens Axboe
2006-03-26 12:33 ` Adrian Bunk
2006-03-26 12:37 ` Jens Axboe
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=20060326122515.GJ4053@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=trond.myklebust@fys.uio.no \
/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
Powered by JetHome