Re: [PATCH] 2.4.10-ac3: fs/cramfs/Makefile

From: Keith Owens (kaos@ocs.com.au)
Date: Tue Oct 02 2001 - 23:05:49 EST


On Tue, 02 Oct 2001 18:14:38 -0400,
Frank Davis <fdavis@si.rr.com> wrote:
> The attached patch against 2.4.10-ac3 addresses the following issue
>since 2.4.9-ac17:
>
>depmod: *** Unresolved symbols in
>/lib/modules/2.4.9-ac17/kernel/fs/cramfs/cramfs/cramfs.o
>depmod: zlib_fs_inflateInit_
>depmod: zlib_fs_inflateEnd
>depmod: zlib_fs_inflate_workspacesize
>depmod: zlib_fs_inflate
>depmod: zlib_fs_inflateReset
>
>--- fs/cramfs/Makefile.old Tue Oct 2 17:44:56 2001
>+++ fs/cramfs/Makefile Tue Oct 2 17:46:51 2001
>@@ -4,7 +4,7 @@
>
> O_TARGET := cramfs.o
>
>-obj-y := inode.o uncompress.o
>+obj-y := inode.o uncompress.o ../inflate_fs/inflate_fs.o

Double plus ungood! The failing combinations are
  CONFIG_CRAMFS=m
  CONFIG_ISO9660_FS=y
  CONFIG_ZISOFS=y
cramfs.o has unresolved references, or
  CONFIG_CRAMFS=y
  CONFIG_ISO9660_FS=m
  CONFIG_ZISOFS=y
isofs.o has unresolved references. Any mixture of built in and modular
users of zlib results in zlib symbols not being available to modules.
The correct fix is

Index: 10.30/fs/inflate_fs/inflate_syms.c
--- 10.30/fs/inflate_fs/inflate_syms.c Sat, 22 Sep 2001 14:41:20 +1000 kaos (linux-2.4/o/f/51_inflate_sy 1.1 644)
+++ 10.30(w)/fs/inflate_fs/inflate_syms.c Wed, 03 Oct 2001 13:58:59 +1000 kaos (linux-2.4/o/f/51_inflate_sy 1.1 644)
@@ -19,10 +19,3 @@ EXPORT_SYMBOL(zlib_fs_inflateSync);
 EXPORT_SYMBOL(zlib_fs_inflateReset);
 EXPORT_SYMBOL(zlib_fs_adler32);
 EXPORT_SYMBOL(zlib_fs_inflateSyncPoint);
-
-static int __init init_zlib_fs(void)
-{
- return 0;
-}
-
-module_init(init_zlib_fs)
Index: 10.30/fs/inflate_fs/Makefile
--- 10.30/fs/inflate_fs/Makefile Sat, 22 Sep 2001 14:41:20 +1000 kaos (linux-2.4/p/f/9_Makefile 1.1 644)
+++ 10.30(w)/fs/inflate_fs/Makefile Wed, 03 Oct 2001 13:58:57 +1000 kaos (linux-2.4/p/f/9_Makefile 1.1 644)
@@ -25,7 +25,7 @@ O_TARGET := inflate_fs.o
 export_objs := inflate_syms.o
 
 obj-y := adler32.o infblock.o infcodes.o inffast.o inflate.o \
- inftrees.o infutil.o
+ inftrees.o infutil.o inflate_syms.o
 obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Oct 07 2001 - 21:00:25 EST