Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux

scripts/Makefile

@@ -18,7 +18,7 @@ modpost-objs  := modpost.o file2alias.o
 subdir-	:= lxdialog kconfig
 
 # fixdep is needed to compile other host programs
-$(addprefix $(obj)/,$(filter-out fixdep,$(host-progs))): $(obj)/fixdep
+$(addprefix $(obj)/,$(filter-out fixdep,$(build-targets))): $(obj)/fixdep
 
 # dependencies on generated files need to be listed explicitly
 

scripts/Makefile.modinst

@@ -9,7 +9,7 @@ include scripts/Makefile.lib
 
 #
 
-__modules := $(shell cd $(MODVERDIR); cat *.mod)
+__modules := $(shell cat /dev/null $(wildcard $(MODVERDIR)/*.mod))
 modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
 
 ifneq ($(filter-out $(modules),$(__modules)),)
@@ -22,7 +22,7 @@ __modinst: $(modules)
 
 # Modules built within the kernel tree
 
-quiet_cmd_modules_install = INSTALL $(obj-m:.o=.ko)
+quiet_cmd_modules_install = INSTALL $@
       cmd_modules_install = mkdir -p $(MODLIB)/kernel/$(@D); \
 			    cp $@ $(MODLIB)/kernel/$(@D)
 

scripts/modpost.c

@@ -270,6 +270,7 @@ handle_modversions(struct module *mod, struct elf_info *info,
 		   Elf_Sym *sym, const char *symname)
 {
 	struct symbol *s;
+	unsigned int crc;
 
 	switch (sym->st_shndx) {
 	case SHN_COMMON:
@@ -279,7 +280,8 @@ handle_modversions(struct module *mod, struct elf_info *info,
 	case SHN_ABS:
 		/* CRC'd symbol */
 		if (memcmp(symname, "__crc_", 6) == 0) {
-			add_exported_symbol(symname+6, mod, &sym->st_value);
+			crc = (unsigned int) sym->st_value;
+			add_exported_symbol(symname+6, mod, &crc);
 			modversions = 1;
 		}
 		break;