[patch] 2.5.70-mm5: Compile error if !CONFIG_PROC_FS

[Adrian Bunk]

It seems the following compile error if !CONFIG_PROC_FS comes from 
Linus' tree:

<--  snip  -->

...
  CC      init/main.o
In file included from init/main.c:15:
include/linux/proc_fs.h:238: redefinition of `kclist_add'
include/linux/proc_fs.h:231: `kclist_add' previously defined here
include/linux/proc_fs.h:239: redefinition of `kclist_del'
include/linux/proc_fs.h:234: `kclist_del' previously defined here
include/linux/proc_fs.h: In function `kclist_del':
include/linux/proc_fs.h:239: syntax error before '}' token
include/linux/proc_fs.h:239: warning: no return statement in function 
returning non-void
make[1]: *** [init/main.o] Error 1

<--  snip  -->

The fis is trivial:

--- linux-2.5.70-mm5/include/linux/proc_fs.h.old	2003-06-07 15:33:21.000000000 +0200
+++ linux-2.5.70-mm5/include/linux/proc_fs.h	2003-06-07 15:34:04.000000000 +0200
@@ -235,8 +235,6 @@
 	return NULL;
 }
 
-static inline void kclist_add(struct kcore_list *new, void *addr, size_t size) {};
-static inline struct kcore_list * kclist_del(void *addr) {return NULL};
 #endif /* CONFIG_PROC_FS */
 
 struct proc_inode {

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed