---

yaml --- r: 96229 b: refs/heads/master c: a5dd697 h: refs/heads/master i: 96227: 6227b1b v: v3
git-mirror · May 9, 2008 · dc2a2fb · dc2a2fb
1 parent 8a4f3e4
commit dc2a2fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c2545eefffc452e52302c96c955d9aa26353aa9
+refs/heads/master: a5dd69707424a35d2d2cc094e870f595ad61e916
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
@@ -917,6 +917,10 @@ static int check_version(Elf_Shdr *sechdrs,
 	if (!crc)
 		return 1;
 
+	/* No versions at all?  modprobe --force does this. */
+	if (versindex == 0)
+		return try_to_force_load(mod, symname) == 0;
+
 	versions = (void *) sechdrs[versindex].sh_addr;
 	num_versions = sechdrs[versindex].sh_size
 		/ sizeof(struct modversion_info);
@@ -932,8 +936,9 @@ static int check_version(Elf_Shdr *sechdrs,
 		goto bad_version;
 	}
 
-	if (!try_to_force_load(mod, symname))
-		return 1;
+	printk(KERN_WARNING "%s: no symbol version for %s\n",
+	       mod->name, symname);
+	return 0;
 
 bad_version:
 	printk("%s: disagrees about version of symbol %s\n",