diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/arm/kernel/module.c | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/kernel/module.c')
| -rw-r--r-- | arch/arm/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index a68259a0cccd..9203ba7d58ee 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -47,7 +47,7 @@ void *module_alloc(unsigned long size) | |||
| 47 | if (!area) | 47 | if (!area) |
| 48 | return NULL; | 48 | return NULL; |
| 49 | 49 | ||
| 50 | return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL); | 50 | return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC); |
| 51 | } | 51 | } |
| 52 | #else /* CONFIG_MMU */ | 52 | #else /* CONFIG_MMU */ |
| 53 | void *module_alloc(unsigned long size) | 53 | void *module_alloc(unsigned long size) |