Merge commit 'origin/master' into next

[linux-2.6-omap-h63xx.git] / arch / xtensa / kernel / module.c

diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index ddf14dcf2ad969d1bc2be814c9ee7f99c3c6d366..3981a466c779cfd57f8e4cd0033581d8dfc3edd4 100644 (file)
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -28,7 +28,7 @@ void *module_alloc(unsigned long size)
 {
        if (size == 0)
                return NULL;
-       return vmalloc(size);
+       return vmalloc_exec(size);
 }
 
 void module_free(struct module *mod, void *module_region)