Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules: do not try to add sysfs attributes if !CONFIG_SYSFS

Browse source 
Thanks to Alexey for the testing and the fix of the fix.

Cc: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2008-02-21 00:33:20 +01:00 committed by Greg Kroah-Hartman
parent 58dc3232ff
commit 120fc3d77a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/module.c
View file

@ -987,12 +987,11 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
return ret; return ret;
} }
/* /*
* /sys/module/foo/sections stuff * /sys/module/foo/sections stuff
* J. Corbet <corbet@lwn.net> * J. Corbet <corbet@lwn.net>
*/ */
#ifdef CONFIG_KALLSYMS #if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS)
static ssize_t module_sect_show(struct module_attribute *mattr, static ssize_t module_sect_show(struct module_attribute *mattr,
struct module *mod, char *buf) struct module *mod, char *buf)
{ {
@ -1188,7 +1187,7 @@ static inline void add_notes_attrs(struct module *mod, unsigned int nsect,
static inline void remove_notes_attrs(struct module *mod) static inline void remove_notes_attrs(struct module *mod)
{ {
} }
#endif /* CONFIG_KALLSYMS */ #endif
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
int module_add_modinfo_attrs(struct module *mod) int module_add_modinfo_attrs(struct module *mod)
@ -1231,9 +1230,7 @@ void module_remove_modinfo_attrs(struct module *mod)
} }
kfree(mod->modinfo_attrs); kfree(mod->modinfo_attrs);
} }
#endif
#ifdef CONFIG_SYSFS
int mod_sysfs_init(struct module *mod) int mod_sysfs_init(struct module *mod)
{ {
int err; int err;