diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 08:06:31 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 08:06:31 +0100 |
| commit | c488a4731abb53aa1bab9fccd8a7472083159bfd (patch) | |
| tree | db6d4a664a1e4b7685c1d2d79da63263f40adf7b /arch/arm | |
| parent | ARM: mach-shmobile: ag5evm requires GPIOLIB (diff) | |
| parent | mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors. (diff) | |
| download | linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.tar.xz linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.zip | |
Merge branch 'common/mmcif' into rmobile-latest
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/module.c | 14 | ||||
| -rw-r--r-- | arch/arm/mm/pgd.c | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 0c1bb68ff4a8..2cfe8161b478 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -38,17 +38,9 @@ #ifdef CONFIG_MMU void *module_alloc(unsigned long size) { - struct vm_struct *area; - - size = PAGE_ALIGN(size); - if (!size) - return NULL; - - area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END); - if (!area) - return NULL; - - return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC); + return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, + GFP_KERNEL, PAGE_KERNEL_EXEC, -1, + __builtin_return_address(0)); } #else /* CONFIG_MMU */ void *module_alloc(unsigned long size) diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c index 93292a18cf77..709244c66fa3 100644 --- a/arch/arm/mm/pgd.c +++ b/arch/arm/mm/pgd.c @@ -50,7 +50,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) if (!new_pmd) goto no_pmd; - new_pte = pte_alloc_map(mm, new_pmd, 0); + new_pte = pte_alloc_map(mm, NULL, new_pmd, 0); if (!new_pte) goto no_pte; |