adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

m68k: rename global variable vmalloc_end to m68k_vmalloc_end

Browse source 
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>
This commit is contained in:
Tejun Heo 2009-12-09 17:43:19 +09:00
parent 50de1a8ef1
commit 51e99be00c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/m68k/include/asm/pgtable_mm.h
View file

@ -83,9 +83,9 @@
#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
#define VMALLOC_END KMAP_START #define VMALLOC_END KMAP_START
#else #else
extern unsigned long vmalloc_end; extern unsigned long m68k_vmalloc_end;
#define VMALLOC_START 0x0f800000 #define VMALLOC_START 0x0f800000
#define VMALLOC_END vmalloc_end #define VMALLOC_END m68k_vmalloc_end
#endif /* CONFIG_SUN3 */ #endif /* CONFIG_SUN3 */
/* zero page used for uninitialized stuff */ /* zero page used for uninitialized stuff */

8
arch/m68k/sun3/mmu_emu.c
View file

@ -45,8 +45,8 @@
** Globals ** Globals
*/ */
unsigned long vmalloc_end; unsigned long m68k_vmalloc_end;
EXPORT_SYMBOL(vmalloc_end); EXPORT_SYMBOL(m68k_vmalloc_end);
unsigned long pmeg_vaddr[PMEGS_NUM]; unsigned long pmeg_vaddr[PMEGS_NUM];
unsigned char pmeg_alloc[PMEGS_NUM]; unsigned char pmeg_alloc[PMEGS_NUM];
@ -172,8 +172,8 @@ void mmu_emu_init(unsigned long bootmem_end)
#endif #endif
// the lowest mapping here is the end of our // the lowest mapping here is the end of our
// vmalloc region // vmalloc region
if(!vmalloc_end) if (!m68k_vmalloc_end)
vmalloc_end = seg; m68k_vmalloc_end = seg;
// mark the segmap alloc'd, and reserve any // mark the segmap alloc'd, and reserve any
// of the first 0xbff pages the hardware is // of the first 0xbff pages the hardware is