summaryrefslogtreecommitdiffstats
path: root/fs/proc/internal.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-04-01 23:49:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-02 10:06:08 -0700
commit05565b65a5309e3e5c86db1975b57f75661bee8f (patch)
treeb7de5495abd95f89235c546068ed6512d4c90f5e /fs/proc/internal.h
parent2e175a90047a2dbc76fde169c990164895b25dfc (diff)
downloadlinux-05565b65a5309e3e5c86db1975b57f75661bee8f.tar.gz
linux-05565b65a5309e3e5c86db1975b57f75661bee8f.tar.bz2
linux-05565b65a5309e3e5c86db1975b57f75661bee8f.zip
[PATCH] proc: fix linkage with CONFIG_SYSCTL=y, CONFIG_PROC_SYSCTL=n
We're using #ifdef CONFIG_SYSCTL, but we should be using CONFIG_PROC_SYSCTL, so we get fs/built-in.o: In function `proc_root_init': /usr/src/linux/fs/proc/root.c:83: undefined reference to `proc_sys_init' Fix that up and remove an ifdef-in-C. Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Helge Hafting <helgehaf@aitel.hist.no> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/internal.h')
-rw-r--r--fs/proc/internal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index c932aa65e198..f771889183c3 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -11,7 +11,11 @@
#include <linux/proc_fs.h>
+#ifdef CONFIG_PROC_SYSCTL
extern int proc_sys_init(void);
+#else
+static inline void proc_sys_init(void) { }
+#endif
struct vmalloc_info {
unsigned long used;