Commit 05565b65 authored Apr 01, 2007 by Andrew Morton Committed by Linus Torvalds Apr 02, 2007

[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>

parent 2e175a90

fs/proc/internal.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;

fs/proc/root.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -79,9 +79,7 @@ void __init proc_root_init(void)
		proc_device_tree_init();
		#endif
		proc_bus = proc_mkdir("bus", NULL);
		#ifdef CONFIG_SYSCTL
		proc_sys_init();
		#endif
		}

		static int proc_root_getattr(struct vfsmount mnt, struct dentry dentry, struct kstat *stat

Admin message