2.4.0-prerelease

Looks good here in most respects, but still needs makefile fixes -

# modprobe tdfx
/lib/modules/2.4.0-prerelease/kernel/drivers/char/drm/tdfx.o: unresolved
symbol remap_page_range
/lib/modules/2.4.0-prerelease/kernel/drivers/char/drm/tdfx.o: unresolved
symbol __wake_up
/lib/modules/2.4.0-prerelease/kernel/drivers/char/drm/tdfx.o: unresolved
symbol mtrr_add
.... etc, etc

Of course, adding

#include <linux/modversions.h>

to drivers/char/drm/drmP.h makes it all work....

jjs

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

Right, but that _shouldn't_ be needed. iirc, modversions.h should be included when needed, so this is covering up the bug not fixing it.

Tom Rini (TR1265)
http://gate.crashing.org/~trini/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

Wrong fix.

drivers/char/drm/Makefile is breaking the Makefile rules. It builds drmlib.a and expects to link that library into both the kernel and into modules. The kernel makefile system assumes that everything is either kernel or module, not both. The components in drmlib.a get compiled for kernel only, when used in a module they are missing the symbol versions.

The ability to link into both kernel and modules will be available in the 2.5 Makefile redesign (already in progress) but this bandaid will fix 2.4. It is still fragile, if you change a drm driver from module to built in or vice versa then you have to manually remove the old drm driver first, but few people will do that (I hope).

The bandaid is to generate two copies of drmlib from the same C sources, one for kernel and one for modules.

Index: 0-prerelease.1/drivers/char/drm/Makefile

@@ -55,13 +55,23 @@ obj-$(CONFIG_DRM_I810)  += i810.o
 # When linking into the kernel, link the library just once. 
 # If making modules, we include the library into each module
 
+lib-objs-mod := $(patsubst %.o,%-mod.o,$(lib-objs))
+obj-m += $(lib-objs-mod)
+
 ifdef MAKING_MODULES
-  lib = drmlib.a
+  lib = drmlib-mod.a
 else
   obj-y += drmlib.a
 endif
 
 include $(TOPDIR)/Rules.make
+
+$(patsubst %.o,%.c,$(lib-objs-mod)): 
+	@ln -sf $(subst -mod,,$@) $@
+
+drmlib-mod.a: $(lib-objs-mod)
+	rm -f $@
+	$(AR) $(EXTRA_ARFLAGS) rcs $@ $(lib-objs-mod)
 
 drmlib.a: $(lib-objs)
 	rm -f $@

Index: 0-prerelease.1/Makefile

@@ -188,6 +188,7 @@ CLEAN_FILES = \
 	.tmp* \
 	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
 	drivers/char/conmakehash \
+	drivers/char/drm/*-mod.c \
 	drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
 	drivers/zorro/devlist.h drivers/zorro/gen-devlist \
 	drivers/sound/bin2hex drivers/sound/hex2hex \

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/