diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/kernel/module.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
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) |