Commit:     05565b65a5309e3e5c86db1975b57f75661bee8f
Parent:     2e175a90047a2dbc76fde169c990164895b25dfc
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Sun Apr 1 23:49:35 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Apr 2 10:06:08 2007 -0700

    [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" <[EMAIL PROTECTED]>
    Cc: Helge Hafting <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 fs/proc/internal.h |    4 ++++
 fs/proc/root.c     |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index c932aa6..f771889 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -11,7 +11,11 @@
 #include <linux/proc_fs.h>
 extern int proc_sys_init(void);
+static inline void proc_sys_init(void) { }
 struct vmalloc_info {
        unsigned long   used;
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 5834a74..41f1703 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -79,9 +79,7 @@ void __init proc_root_init(void)
        proc_bus = proc_mkdir("bus", NULL);
 static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, 
struct kstat *stat
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to