The patch titled
fix gregkh-driver-modules-state
has been added to the -mm tree. Its filename is
fix-gregkh-driver-modules-state.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix gregkh-driver-modules-state
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Hello,
When CONFIG_MODULE_UNLOAD is not set then this happens:
CC kernel/module.o
kernel/module.c:852: error: `initstate' undeclared here (not in a function)
kernel/module.c:852: error: initializer element is not constant
kernel/module.c:852: error: (near initialization for `modinfo_attrs[2]')
make[1]: *** [kernel/module.o] Error 1
make: *** [kernel] Error 2
Reference to 'initstate' should stay under #ifdef CONFIG_MODULE_UNLOAD
as its definition I guess.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/module.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/module.c~fix-gregkh-driver-modules-state kernel/module.c
--- a/kernel/module.c~fix-gregkh-driver-modules-state
+++ a/kernel/module.c
@@ -849,8 +849,8 @@ static inline void module_unload_init(st
static struct module_attribute *modinfo_attrs[] = {
&modinfo_version,
&modinfo_srcversion,
- &initstate,
#ifdef CONFIG_MODULE_UNLOAD
+ &initstate,
&refcnt,
#endif
NULL,
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
fix-gregkh-driver-modules-state.patch
i2lib-unused-variable-cleanup.patch
make-1-bit-bitfields-unsigned.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
