summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.ninka.net>2003-04-02 23:49:50 -0800
committerDavid S. Miller <davem@nuts.ninka.net>2003-04-02 23:49:50 -0800
commitbd4efa7351f3e3f54b47cb3ceac9d6cf94dc25e1 (patch)
tree328ecb0c4bd6b9fbadd5b1d18c4c4f27f3e87453 /kernel
parent513230c4f87271d1296ad67ecdf789ba93231a21 (diff)
parent8b4d8f66184974d3286b19cd17b85c7b6100ef5f (diff)
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c
index dbb503b729ee..b867bf84c5f1 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -974,6 +974,11 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
/* Ok if weak. */
if (ELF_ST_BIND(sym[i].st_info) == STB_WEAK)
break;
+#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+ /* Ok if Sparc register directive. */
+ if (ELF_ST_TYPE(sym[i].st_info) == STT_REGISTER)
+ break;
+#endif
printk(KERN_WARNING "%s: Unknown symbol %s\n",
mod->name, strtab + sym[i].st_name);