diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/xtensa/kernel/module.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/xtensa/kernel/module.c')
| -rw-r--r-- | arch/xtensa/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c index ddf14dcf2ad9..3981a466c779 100644 --- a/arch/xtensa/kernel/module.c +++ b/arch/xtensa/kernel/module.c | |||
| @@ -28,7 +28,7 @@ void *module_alloc(unsigned long size) | |||
| 28 | { | 28 | { |
| 29 | if (size == 0) | 29 | if (size == 0) |
| 30 | return NULL; | 30 | return NULL; |
| 31 | return vmalloc(size); | 31 | return vmalloc_exec(size); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | void module_free(struct module *mod, void *module_region) | 34 | void module_free(struct module *mod, void *module_region) |