From 110aecf74bfb41c7e3e25d3f1e41530290e0ba7c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 21 Feb 2008 00:33:20 +0100
Subject: [PATCH] --- yaml --- r: 86100 b: refs/heads/master c:
 120fc3d77acfd91f3521737a440d42839c475982 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/module.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe7333b4b572..9817cf397e96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58dc3232ff77158460f79e3c1932b81e8a2a0194
+refs/heads/master: 120fc3d77acfd91f3521737a440d42839c475982
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 92595bad3812..901cd6ac2f11 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -987,12 +987,11 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
 	return ret;
 }
 
-
 /*
  * /sys/module/foo/sections stuff
  * 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,
 				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)
 {
 }
-#endif /* CONFIG_KALLSYMS */
+#endif
 
 #ifdef CONFIG_SYSFS
 int module_add_modinfo_attrs(struct module *mod)
@@ -1231,9 +1230,7 @@ void module_remove_modinfo_attrs(struct module *mod)
 	}
 	kfree(mod->modinfo_attrs);
 }
-#endif
 
-#ifdef CONFIG_SYSFS
 int mod_sysfs_init(struct module *mod)
 {
 	int err;