diff options
author | Tejun Heo <tj@kernel.org> | 2009-10-02 13:28:55 +0900 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-02 13:28:55 +0900 |
commit | 126b3fcdecd350cad9700908d0ad845084e26a31 (patch) | |
tree | 186a166e821bfb85b8434308c1577690aaa91ad4 /arch/ia64/include/asm/meminit.h | |
parent | 0efe5e32c8729ef44b00d9a7203e4c99a6378b27 (diff) | |
download | op-kernel-dev-126b3fcdecd350cad9700908d0ad845084e26a31.zip op-kernel-dev-126b3fcdecd350cad9700908d0ad845084e26a31.tar.gz |
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/meminit.h')
-rw-r--r-- | arch/ia64/include/asm/meminit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/meminit.h b/arch/ia64/include/asm/meminit.h index 688a812..61c7b17 100644 --- a/arch/ia64/include/asm/meminit.h +++ b/arch/ia64/include/asm/meminit.h @@ -61,7 +61,7 @@ extern int register_active_ranges(u64 start, u64 len, int nid); #ifdef CONFIG_VIRTUAL_MEM_MAP # define LARGE_GAP 0x40000000 /* Use virtual mem map if hole is > than this */ - extern unsigned long vmalloc_end; + extern unsigned long VMALLOC_END; extern struct page *vmem_map; extern int find_largest_hole(u64 start, u64 end, void *arg); extern int create_mem_map_page_table(u64 start, u64 end, void *arg); |