2.4.10-ac9: EXPORT_SYMBOLS compile fix
PATCH 1/1 2.4.10-ac9: EXPORT_SYMBOLS compile fix
The attached is against 2.4.10-ac9. The problem cropped up in ac8.
The kernel will not compile without modules. This is from a patch by Keith Owens for 2.4.11-pre5 which has the same problem. Keith, I assume this is right?
include/linux/module.h +7 -3
@@ -348,9 +348,6 @@#define EXPORT_SYMBOL_NOVERS (var) error config_must_be_included_before_module#define EXPORT_SYMBOL_GPL (var) error config_must_be_included_before_module -#elif !defined(EXPORT_SYMTAB ) - -#define __EXPORT_SYMBOL (sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL_NOVERS (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL_GPL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
@@ -362,6 +359,13 @@#define EXPORT_SYMBOL_NOVERS (var)#define EXPORT_SYMBOL_GPL (var) +#elif !defined(EXPORT_SYMTAB ) + +#define __EXPORT_SYMBOL (sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_NOVERS (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_GPL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#else #define __EXPORT_SYMBOL (sym, str) \
Robert Love
Quoted 22 lines · Robert Love
The attached is against 2.4.10-ac9. The problem cropped up in ac8.
The kernel will not compile without modules. This is from a patch by Keith Owens for 2.4.11-pre5 which has the same problem. Keith, I assume this is right?
include/linux/module.h +0
-3@@ -348,9 +348,6 @@#define EXPORT_SYMBOL_NOVERS (var) error config_must_be_included_before_module#define EXPORT_SYMBOL_GPL (var) error config_must_be_included_before_module -#elif !defined(EXPORT_SYMTAB ) - -#define __EXPORT_SYMBOL (sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL_NOVERS (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile#define EXPORT_SYMBOL_GPL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile@@ -362,6 +359,13 @@#define EXPORT_SYMBOL_NOVERS (var)#define EXPORT_SYMBOL_GPL (var)
include/linux/module.h line 371
Quoted 10 lines
include/linux/module.h +7
-0+#elif !defined(EXPORT_SYMTAB ) + +#define __EXPORT_SYMBOL (sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_NOVERS (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_GPL (var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#else #define __EXPORT_SYMBOL (sym, str) \
The patch is incomplete, you left some lines behind. This is the patch against 2.4.11-pre5.
Index: 11-pre5.1/include/linux/module.h
include/linux/module.h Mon, 08 Oct 2001 11:08:09 +1000 kaos (linux-2.4/c/b/46_module.h 1.1.1.1.2.6 644) renamed from include/linux/module.h Mon, 08 Oct 2001 10:58:25 +1000 kaos (linux-2.4/c/b/46_module.h 1.1.1.1.2.6 644) +7 -7
@@ -348,19 +348,19 @@ extern struct module *module_list; #define EXPORT_SYMBOL_NOVERS(var) error config_must_be_included_before_module #define EXPORT_SYMBOL_GPL(var) error config_must_be_included_before_module -#elif !defined(EXPORT_SYMTAB) - -#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile -#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile -#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile -#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile - #elif !defined(CONFIG_MODULES) #define __EXPORT_SYMBOL(sym,str) #define EXPORT_SYMBOL(var) #define EXPORT_SYMBOL_NOVERS(var) #define EXPORT_SYMBOL_GPL(var) + +#elif !defined(EXPORT_SYMTAB) + +#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile +#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile #else
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 2 lines · Keith Owens
The patch is incomplete, you left some lines behind. This is the patch against 2.4.11-pre5.
Whoops, thanks. Anyhow, looks like Alan merged your patch in 2.4.10-ac10...
Robert Love