Messages in this thread Patch in this message | | | Date | Sun, 4 May 2008 09:29:43 +0200 | From | Ingo Molnar <> | Subject | [patch] sysfs: build fix |
| |
x86.git testing found the following build failure on v2.6.26-rc1:
In file included from include/linux/kobject.h:22, from include/linux/module.h:17, from include/linux/crypto.h:22, from arch/x86/kernel/asm-offsets_32.c:8, from arch/x86/kernel/asm-offsets.c:3: include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group' include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make: *** [prepare0] Error 2
with the following config:
http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
the reason for the build failure is the duplicate definition of the sysfs_update_group() inline function in include/linux/sysfs.h.
The duplication was a merge error: it was added via -mm by commit v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same commit was already merged upstream via the sysfs tree, with commit v2.6.25-7211-g1cbfb7a.
Signed-off-by: Ingo Molnar <mingo@elte.hu> --- include/linux/sysfs.h | 6 ------ 1 file changed, 6 deletions(-)
Index: linux/include/linux/sysfs.h =================================================================== --- linux.orig/include/linux/sysfs.h +++ linux/include/linux/sysfs.h @@ -196,12 +196,6 @@ static inline int sysfs_update_group(str return 0; } -static inline int sysfs_update_group(struct kobject *kobj, - const struct attribute_group *grp) -{ - return 0; -} - static inline void sysfs_remove_group(struct kobject *kobj, const struct attribute_group *grp) {
| |