diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-06 12:11:07 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-06 12:13:47 -0500 |
commit | ab4f2ee130d5ffcf35616e1f5c6ab75af5b463b6 (patch) | |
tree | 7532eb50e674402f8f658094acb71b8dfb1117bf /arch/arm/mm/mmu.c | |
parent | d2ed5cb80a241518dd71f467c884bfabbe15f68c (diff) |
[ARM] fix naming of MODULE_START / MODULE_END
As of 73bdf0a60e607f4b8ecc5aec597105976565a84f, the kernel needs
to know where modules are located in the virtual address space.
On ARM, we located this region between MODULE_START and MODULE_END.
Unfortunately, everyone else calls it MODULES_VADDR and MODULES_END.
Update ARM to use the same naming, so is_vmalloc_or_module_addr()
can work properly. Also update the comment on mm/vmalloc.c to
reflect that ARM also places modules in a separate region from the
vmalloc space.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r-- | arch/arm/mm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 8ba754064559..34e53596ff1d 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -654,7 +654,7 @@ static inline void prepare_page_table(struct meminfo *mi) | |||
654 | /* | 654 | /* |
655 | * Clear out all the mappings below the kernel image. | 655 | * Clear out all the mappings below the kernel image. |
656 | */ | 656 | */ |
657 | for (addr = 0; addr < MODULE_START; addr += PGDIR_SIZE) | 657 | for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE) |
658 | pmd_clear(pmd_off_k(addr)); | 658 | pmd_clear(pmd_off_k(addr)); |
659 | 659 | ||
660 | #ifdef CONFIG_XIP_KERNEL | 660 | #ifdef CONFIG_XIP_KERNEL |
@@ -766,7 +766,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
766 | */ | 766 | */ |
767 | #ifdef CONFIG_XIP_KERNEL | 767 | #ifdef CONFIG_XIP_KERNEL |
768 | map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK); | 768 | map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK); |
769 | map.virtual = MODULE_START; | 769 | map.virtual = MODULES_VADDR; |
770 | map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; | 770 | map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; |
771 | map.type = MT_ROM; | 771 | map.type = MT_ROM; |
772 | create_mapping(&map); | 772 | create_mapping(&map); |