diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 15:43:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 15:43:39 +0100 |
| commit | eb42c75878e4d13941dcbcf2ef1027c257b099a6 (patch) | |
| tree | f0fa257a00b4cac528b79724f59b076f30b1dd3d /arch/arm/kernel/module.c | |
| parent | 9868ee63b896ee4d2ceb8c292e88d7f4e66caaf9 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.tar.gz linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.tar.bz2 linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.zip | |
Merge branch 'linus' into x86/crashdump
Diffstat (limited to 'arch/arm/kernel/module.c')
| -rw-r--r-- | arch/arm/kernel/module.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 9203ba7d58ee..b8d965dcd6fd 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -26,12 +26,12 @@ /* * The XIP kernel text is mapped in the module area for modules and * some other stuff to work without any indirect relocations. - * MODULE_START is redefined here and not in asm/memory.h to avoid + * MODULES_VADDR is redefined here and not in asm/memory.h to avoid * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. */ extern void _etext; -#undef MODULE_START -#define MODULE_START (((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK) +#undef MODULES_VADDR +#define MODULES_VADDR (((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK) #endif #ifdef CONFIG_MMU @@ -43,7 +43,7 @@ void *module_alloc(unsigned long size) if (!size) return NULL; - area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END); + area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END); if (!area) return NULL; |