From c8fa63b9e42e2744e2791e16303fb0d20f96340f Mon Sep 17 00:00:00 2001 From: Gary King Date: Tue, 2 Feb 2010 17:01:22 -0800 Subject: ARM highmem: remove redundant definition of MODULES_END when 2468311edda7e91b9e9ece9a05e4d2337217a9d0 was cherry-picked, the merge wasn't resolved correctly, and left a dangling MODULES_END declaration. with CONFIG_HIGHMEM enabled, this caused numerous compiler warnings Change-Id: If401e4591f12316df3db33db4dd7dca03a10b9d4 --- arch/arm/include/asm/memory.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 415433c91343..ebee898535ce 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -44,12 +44,11 @@ * The module space lives between the addresses given by TASK_SIZE * and PAGE_OFFSET - it must be within 32MB of the kernel text. */ -#define MODULES_END (PAGE_OFFSET) #ifndef CONFIG_THUMB2_KERNEL -#define MODULES_VADDR (MODULES_END - 16*1048576) +#define MODULES_VADDR (PAGE_OFFSET - 16*1024*1024) #else /* smaller range for Thumb-2 symbols relocation (2^24)*/ -#define MODULES_VADDR (MODULES_END - 8*1048576) +#define MODULES_VADDR (PAGE_OFFSET - 8*1024*1024) #endif #if TASK_SIZE > MODULES_VADDR -- cgit v1.2.3