diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:30:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:30:36 -0700 |
| commit | 65d52cc9d47975f4fbd0a50e62f4a49be2c0514a (patch) | |
| tree | 01f8eccc8ffac28112a58e397d96e8eba2de5ebf /arch/um/sys-x86_64/um_module.c | |
| parent | d614aec4752f8c61b2e7cb77806b6bd59aa50836 (diff) | |
| parent | 5933048c69edb546f1e93c26dc93816f0be9f754 (diff) | |
| download | linux-3.10-65d52cc9d47975f4fbd0a50e62f4a49be2c0514a.tar.gz linux-3.10-65d52cc9d47975f4fbd0a50e62f4a49be2c0514a.tar.bz2 linux-3.10-65d52cc9d47975f4fbd0a50e62f4a49be2c0514a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
module: cleanup FIXME comments about trimming exception table entries.
module: trim exception table on init free.
module: merge module_alloc() finally
uml module: fix uml build process due to this merge
x86 module: merge the rest functions with macros
x86 module: merge the same functions in module_32.c and module_64.c
uvesafb: improve parameter handling.
module_param: allow 'bool' module_params to be bool, not just int.
module_param: add __same_type convenience wrapper for __builtin_types_compatible_p
module_param: split perm field into flags and perm
module_param: invbool should take a 'bool', not an 'int'
cyber2000fb.c: use proper method for stopping unload if CONFIG_ARCH_SHARK
Diffstat (limited to 'arch/um/sys-x86_64/um_module.c')
| -rw-r--r-- | arch/um/sys-x86_64/um_module.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/um/sys-x86_64/um_module.c b/arch/um/sys-x86_64/um_module.c deleted file mode 100644 index 3dead392a41..00000000000 --- a/arch/um/sys-x86_64/um_module.c +++ /dev/null @@ -1,21 +0,0 @@ -#include <linux/vmalloc.h> -#include <linux/moduleloader.h> - -/* Copied from i386 arch/i386/kernel/module.c */ -void *module_alloc(unsigned long size) -{ - if (size == 0) - return NULL; - return vmalloc_exec(size); -} - -/* Free memory returned from module_alloc */ -void module_free(struct module *mod, void *module_region) -{ - vfree(module_region); - /* - * FIXME: If module_region == mod->init_region, trim exception - * table entries. - */ -} - |