diff options
author | Tejun Heo <tj@kernel.org> | 2009-10-02 04:28:55 (GMT) |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-02 04:28:55 (GMT) |
commit | 126b3fcdecd350cad9700908d0ad845084e26a31 (patch) | |
tree | 186a166e821bfb85b8434308c1577690aaa91ad4 /arch/ia64/include/asm/pgtable.h | |
parent | 0efe5e32c8729ef44b00d9a7203e4c99a6378b27 (diff) | |
download | linux-fsl-qoriq-126b3fcdecd350cad9700908d0ad845084e26a31.tar.xz |
ia64: don't alias VMALLOC_END to vmalloc_end
If CONFIG_VIRTUAL_MEM_MAP is enabled, ia64 defines macro VMALLOC_END
as unsigned long variable vmalloc_end which is adjusted to prepare
room for vmemmap. This becomes probnlematic if a local variables
vmalloc_end is defined in some function (not very unlikely) and
VMALLOC_END is used in the function - the function thinks its
referencing the global VMALLOC_END value but would be referencing its
own local vmalloc_end variable.
There's no reason VMALLOC_END should be a macro. Just define it as an
unsigned long variable if CONFIG_VIRTUAL_MEM_MAP is set to avoid nasty
surprises.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64 <linux-ia64@vger.kernel.org>
Cc: Christoph Lameter <cl@linux-foundation.org>
Diffstat (limited to 'arch/ia64/include/asm/pgtable.h')
-rw-r--r-- | arch/ia64/include/asm/pgtable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 8840a69..69bf138 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -228,8 +228,7 @@ ia64_phys_addr_valid (unsigned long addr) #define VMALLOC_START (RGN_BASE(RGN_GATE) + 0x200000000UL) #ifdef CONFIG_VIRTUAL_MEM_MAP # define VMALLOC_END_INIT (RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 9))) -# define VMALLOC_END vmalloc_end - extern unsigned long vmalloc_end; +extern unsigned long VMALLOC_END; #else #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_SPARSEMEM_VMEMMAP) /* SPARSEMEM_VMEMMAP uses half of vmalloc... */ |