diff options
| author | Tejun Heo <tj@kernel.org> | 2009-12-09 17:43:19 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-12-09 17:43:19 +0900 |
| commit | 51e99be00ce2713cbb841cedc997cafa6e26c7f4 (patch) | |
| tree | 0e49ba8d6f9c061650950e241de01089bb79ab26 /arch/m68k/include/asm/pgtable_mm.h | |
| parent | 50de1a8ef18da0cfff97543315b4e042e8bb7c83 (diff) | |
| download | blackbird-op-linux-51e99be00ce2713cbb841cedc997cafa6e26c7f4.tar.gz blackbird-op-linux-51e99be00ce2713cbb841cedc997cafa6e26c7f4.zip | |
m68k: rename global variable vmalloc_end to m68k_vmalloc_end
On SUN3, m68k defines macro VMALLOC_END as unsigned long variable
vmalloc_end which is adjusted from mmu_emu_init(). This becomes
problematic 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.
Rename the global variable to m68k_vmlloc_end which is much less
likely to be used as local variable name.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/pgtable_mm.h')
| -rw-r--r-- | arch/m68k/include/asm/pgtable_mm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h index fe60e1abaee8..aca0e28581c7 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h @@ -83,9 +83,9 @@ #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) #define VMALLOC_END KMAP_START #else -extern unsigned long vmalloc_end; +extern unsigned long m68k_vmalloc_end; #define VMALLOC_START 0x0f800000 -#define VMALLOC_END vmalloc_end +#define VMALLOC_END m68k_vmalloc_end #endif /* CONFIG_SUN3 */ /* zero page used for uninitialized stuff */ |
