summaryrefslogtreecommitdiff
path: root/include/linux/quicklist.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-17 01:11:43 +0400
committerDavid S. Miller <davem@davemloft.net>2008-09-17 01:11:43 +0400
commit2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch)
treec4f58ec96c06642c4b415b881d3f0a3b673d5b44 /include/linux/quicklist.h
parent9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff)
parentf948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff)
downloadlinux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts: arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'include/linux/quicklist.h')
-rw-r--r--include/linux/quicklist.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h
index 39b66713a0bb..bd466439c588 100644
--- a/include/linux/quicklist.h
+++ b/include/linux/quicklist.h
@@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *),
unsigned long quicklist_total_size(void);
+#else
+
+static inline unsigned long quicklist_total_size(void)
+{
+ return 0;
+}
+
#endif
#endif /* LINUX_QUICKLIST_H */