git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
arch
/
avr32
/
kernel
/
module.c
diff --git
a/arch/avr32/kernel/module.c
b/arch/avr32/kernel/module.c
index
a727f54
..
596f730
100644
(file)
--- a/
arch/avr32/kernel/module.c
+++ b/
arch/avr32/kernel/module.c
@@
-19,13
+19,6
@@
#include <linux/moduleloader.h>
#include <linux/vmalloc.h>
#include <linux/moduleloader.h>
#include <linux/vmalloc.h>
-void *module_alloc(unsigned long size)
-{
- if (size == 0)
- return NULL;
- return vmalloc(size);
-}
-
void module_free(struct module *mod, void *module_region)
{
vfree(mod->arch.syminfo);
void module_free(struct module *mod, void *module_region)
{
vfree(mod->arch.syminfo);
@@
-299,15
+292,6
@@
int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
return ret;
}
return ret;
}
-int apply_relocate(Elf32_Shdr *sechdrs, const char *strtab,
- unsigned int symindex, unsigned int relindex,
- struct module *module)
-{
- printk(KERN_ERR "module %s: REL relocations are not supported\n",
- module->name);
- return -ENOEXEC;
-}
-
int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
struct module *module)
{
int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
struct module *module)
{
@@
-316,7
+300,3
@@
int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
return 0;
}
return 0;
}
-
-void module_arch_cleanup(struct module *module)
-{
-}