tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+6
-6
+2
-2
arch/m68k/include/asm/pgtable_mm.h
+2
-2
arch/m68k/include/asm/pgtable_mm.h
···
83
83
#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
84
84
#define VMALLOC_END KMAP_START
85
85
#else
86
-
extern unsigned long vmalloc_end;
86
+
extern unsigned long m68k_vmalloc_end;
87
87
#define VMALLOC_START 0x0f800000
88
-
#define VMALLOC_END vmalloc_end
88
+
#define VMALLOC_END m68k_vmalloc_end
89
89
#endif /* CONFIG_SUN3 */
90
90
91
91
/* zero page used for uninitialized stuff */
+4
-4
arch/m68k/sun3/mmu_emu.c
+4
-4
arch/m68k/sun3/mmu_emu.c
···
45
45
** Globals
46
46
*/
47
47
48
-
unsigned long vmalloc_end;
49
-
EXPORT_SYMBOL(vmalloc_end);
48
+
unsigned long m68k_vmalloc_end;
49
+
EXPORT_SYMBOL(m68k_vmalloc_end);
50
50
51
51
unsigned long pmeg_vaddr[PMEGS_NUM];
52
52
unsigned char pmeg_alloc[PMEGS_NUM];
···
172
172
#endif
173
173
// the lowest mapping here is the end of our
174
174
// vmalloc region
175
-
if(!vmalloc_end)
176
-
vmalloc_end = seg;
175
+
if (!m68k_vmalloc_end)
176
+
m68k_vmalloc_end = seg;
177
177
178
178
// mark the segmap alloc'd, and reserve any
179
179
// of the first 0xbff pages the hardware is