Commit:     5c46010af210712c8a390c7fe50ff05448983061
Parent:     b8f2f5165c3eb22d7b19405d80fd82339507a950
Author:     Mika Kukkonen <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 26 21:32:33 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Mar 27 09:05:16 2007 -0700

    [PATCH] Fix kernel build with EMBEDDED & PROC_FS & !PROC_SYSCTL
    Without attached patch against current -git I get following with
    !PROC_SYSCTL (with EMBEDDED and PROC_FS set):
        CC      init/version.o
        LD      init/built-in.o
        LD      vmlinux
      fs/built-in.o: In function `do_proc_sys_lookup':
      proc_sysctl.c:(.text+0x26583): undefined reference to `sysctl_head_next'
      fs/built-in.o: In function `proc_sys_revalidate':
      proc_sysctl.c:(.text+0x265bb): undefined reference to `sysctl_head_finish'
      fs/built-in.o: In function `proc_sys_readdir':
      proc_sysctl.c:(.text+0x26720): undefined reference to `sysctl_head_next'
      proc_sysctl.c:(.text+0x267d8): undefined reference to `sysctl_head_finish'
      proc_sysctl.c:(.text+0x268e7): undefined reference to `sysctl_head_next'
      proc_sysctl.c:(.text+0x26910): undefined reference to `sysctl_head_finish'
      fs/built-in.o: In function `proc_sys_write':
      proc_sysctl.c:(.text+0x2695d): undefined reference to `sysctl_perm'
      proc_sysctl.c:(.text+0x2699c): undefined reference to `sysctl_head_finish'
      fs/built-in.o: In function `proc_sys_read':
      proc_sysctl.c:(.text+0x269e9): undefined reference to `sysctl_perm'
      proc_sysctl.c:(.text+0x26a25): undefined reference to `sysctl_head_finish'
      fs/built-in.o: In function `proc_sys_permission':
      proc_sysctl.c:(.text+0x26ad1): undefined reference to `sysctl_perm'
      proc_sysctl.c:(.text+0x26adb): undefined reference to `sysctl_head_finish'
      fs/built-in.o: In function `proc_sys_lookup':
      proc_sysctl.c:(.text+0x26b39): undefined reference to `sysctl_head_finish'
      make: *** [vmlinux] Virhe 1
    All those functions are in fs/proc/proc_sysctl.c, which has no CONFIG_
    #define's in it, so the patch makes the compilation of that file to depend
    on CONFIG_PROC_SYSCTL (the simplest choice).
    Acked-by: "Eric W. Biederman" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 fs/proc/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index a6b3a8f..bce38e3 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -8,8 +8,9 @@ proc-y                  := nommu.o task_nommu.o
 proc-$(CONFIG_MMU)     := mmu.o task_mmu.o
 proc-y       += inode.o root.o base.o generic.o array.o \
-               proc_tty.o proc_misc.o proc_sysctl.o
+               proc_tty.o proc_misc.o
+proc-$(CONFIG_PROC_SYSCTL)     += proc_sysctl.o
 proc-$(CONFIG_PROC_KCORE)      += kcore.o
 proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
 proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
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