Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcda12e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  modpost: Fix modpost's license checking V3
  module: add /sys/module/<name>/uevent files
  module: change attr callbacks to take struct module_kobject
  modules: make arch's use default loader hooks
  modules: add default loader hook implementations
  param: fix return value handling in param_set_*
parents 5fabc487 62a26356

arch/alpha/kernel/module.c

+0 −34
Original line number Diff line number Diff line
@@ -29,20 +29,6 @@ 
#define DEBUGP(fmt...)

#endif



void *

module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return vmalloc(size);

}



void

module_free(struct module *mod, void *module_region)

{

	vfree(module_region);

}



/* Allocate the GOT at the end of the core sections.  */



struct got_entry {
@@ -155,14 +141,6 @@ module_frob_arch_sections(Elf64_Ehdr *hdr, Elf64_Shdr *sechdrs, 
	return 0;

}



int

apply_relocate(Elf64_Shdr *sechdrs, const char *strtab, unsigned int symindex,

	       unsigned int relsec, struct module *me)

{

	printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);

	return -ENOEXEC;

}



int

apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,

		   unsigned int symindex, unsigned int relsec,
@@ -302,15 +280,3 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, 


	return 0;

}
 


int

module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,

		struct module *me)

{

	return 0;

}



void

module_arch_cleanup(struct module *mod)

{

}

arch/arm/kernel/module.c

+1 −28
Original line number Diff line number Diff line
@@ -43,25 +43,7 @@ void *module_alloc(unsigned long size) 
				GFP_KERNEL, PAGE_KERNEL_EXEC, -1,

				__builtin_return_address(0));

}

#else /* CONFIG_MMU */

void *module_alloc(unsigned long size)

{

	return size == 0 ? NULL : vmalloc(size);

}

#endif /* !CONFIG_MMU */



void module_free(struct module *module, void *region)

{

	vfree(region);

}



int module_frob_arch_sections(Elf_Ehdr *hdr,

			      Elf_Shdr *sechdrs,

			      char *secstrings,

			      struct module *mod)

{

	return 0;

}

#endif



int

apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
@@ -265,15 +247,6 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 
	return 0;

}



int

apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,

		   unsigned int symindex, unsigned int relsec, struct module *module)

{

	printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n",

	       module->name);

	return -ENOEXEC;

}



struct mod_unwind_map {

	const Elf_Shdr *unw_sec;

	const Elf_Shdr *txt_sec;

arch/avr32/kernel/module.c

+0 −20
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
#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);
@@ -299,15 +292,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, 
	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)

{
@@ -316,7 +300,3 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, 


	return 0;

}
 


void module_arch_cleanup(struct module *module)

{

}

arch/blackfin/kernel/module.c

+0 −21
Original line number Diff line number Diff line
@@ -16,19 +16,6 @@ 
#include <asm/cacheflush.h>

#include <asm/uaccess.h>



void *module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return vmalloc(size);

}



/* Free memory returned from module_alloc */

void module_free(struct module *mod, void *module_region)

{

	vfree(module_region);

}



/* Transfer the section to the L1 memory */

int

module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
@@ -150,14 +137,6 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, 
	return 0;

}



int

apply_relocate(Elf_Shdr * sechdrs, const char *strtab,

	       unsigned int symindex, unsigned int relsec, struct module *mod)

{

	pr_err(".rel unsupported\n");

	return -ENOEXEC;

}



/*************************************************************************/

/* FUNCTION : apply_relocate_add                                         */

/* ABSTRACT : Blackfin specific relocation handling for the loadable     */

arch/cris/kernel/module.c

+3 −40
Original line number Diff line number Diff line
@@ -30,45 +30,19 @@ 
#endif



#ifdef CONFIG_ETRAX_KMALLOCED_MODULES

#define MALLOC_MODULE(size) kmalloc(size, GFP_KERNEL)

#define FREE_MODULE(region) kfree(region)

#else

#define MALLOC_MODULE(size) vmalloc_exec(size)

#define FREE_MODULE(region) vfree(region)

#endif



void *module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return MALLOC_MODULE(size);

	return kmalloc(size, GFP_KERNEL);

}





/* Free memory returned from module_alloc */

void module_free(struct module *mod, void *module_region)

{

	FREE_MODULE(module_region);

}



/* We don't need anything special. */

int module_frob_arch_sections(Elf_Ehdr *hdr,

			      Elf_Shdr *sechdrs,

			      char *secstrings,

			      struct module *mod)

{

	return 0;

}



int apply_relocate(Elf32_Shdr *sechdrs,

		   const char *strtab,

		   unsigned int symindex,

		   unsigned int relsec,

		   struct module *me)

{

	printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);

	return -ENOEXEC;

	kfree(module_region);

}

#endif



int apply_relocate_add(Elf32_Shdr *sechdrs,

		       const char *strtab,
@@ -108,14 +82,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, 


	return 0;

}
 


int module_finalize(const Elf_Ehdr *hdr,

		    const Elf_Shdr *sechdrs,

		    struct module *me)

{

 	return 0;

}



void module_arch_cleanup(struct module *mod)

{

}