Commit 298af9d8 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: fix up some bad global variable names in mm/init.c 



Impact: cleanup

The table_start, table_end, and table_top are too generic for global
namespace so rename them to be more specific.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-15-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f765090a

arch/x86/mm/init.c

+13 −13
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ kernel_physical_mapping_init(unsigned long start, 
			     unsigned long page_size_mask);

#endif



unsigned long __initdata table_start;

unsigned long __meminitdata table_end;

unsigned long __meminitdata table_top;

unsigned long __initdata e820_table_start;

unsigned long __meminitdata e820_table_end;

unsigned long __meminitdata e820_table_top;



int after_bootmem;
@@ -78,21 +78,21 @@ static void __init find_early_table_space(unsigned long end, int use_pse, 
	 */

#ifdef CONFIG_X86_32

	start = 0x7000;

	table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,

	e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,

					tables, PAGE_SIZE);

#else /* CONFIG_X86_64 */

	start = 0x8000;

	table_start = find_e820_area(start, end, tables, PAGE_SIZE);

	e820_table_start = find_e820_area(start, end, tables, PAGE_SIZE);

#endif

	if (table_start == -1UL)

	if (e820_table_start == -1UL)

		panic("Cannot find space for the kernel page tables");



	table_start >>= PAGE_SHIFT;

	table_end = table_start;

	table_top = table_start + (tables >> PAGE_SHIFT);

	e820_table_start >>= PAGE_SHIFT;

	e820_table_end = e820_table_start;

	e820_table_top = e820_table_start + (tables >> PAGE_SHIFT);



	printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",

		end, table_start << PAGE_SHIFT, table_top << PAGE_SHIFT);

		end, e820_table_start << PAGE_SHIFT, e820_table_top << PAGE_SHIFT);

}



struct map_range {
@@ -324,9 +324,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
#endif

	__flush_tlb_all();



	if (!after_bootmem && table_end > table_start)

		reserve_early(table_start << PAGE_SHIFT,

				 table_end << PAGE_SHIFT, "PGTABLE");

	if (!after_bootmem && e820_table_end > e820_table_start)

		reserve_early(e820_table_start << PAGE_SHIFT,

				 e820_table_end << PAGE_SHIFT, "PGTABLE");



	if (!after_bootmem)

		early_memtest(start, end);

arch/x86/mm/init_32.c

+7 −7
Original line number Diff line number Diff line
@@ -59,16 +59,16 @@ unsigned long highstart_pfn, highend_pfn; 
static noinline int do_test_wp_bit(void);





extern unsigned long __initdata table_start;

extern unsigned long __meminitdata table_end;

extern unsigned long __meminitdata table_top;

extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



static __init void *alloc_low_page(void)

{

	unsigned long pfn = table_end++;

	unsigned long pfn = e820_table_end++;

	void *adr;



	if (pfn >= table_top)

	if (pfn >= e820_table_top)

		panic("alloc_low_page: ran out of memory");



	adr = __va(pfn * PAGE_SIZE);
@@ -149,8 +149,8 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd, 
	if (pmd_idx_kmap_begin != pmd_idx_kmap_end

	    && (vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin

	    && (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end

	    && ((__pa(pte) >> PAGE_SHIFT) < table_start

		|| (__pa(pte) >> PAGE_SHIFT) >= table_end)) {

	    && ((__pa(pte) >> PAGE_SHIFT) < e820_table_start

		|| (__pa(pte) >> PAGE_SHIFT) >= e820_table_end)) {

		pte_t *newpte;

		int i;

arch/x86/mm/init_64.c

+5 −5
Original line number Diff line number Diff line
@@ -283,13 +283,13 @@ void __init cleanup_highmap(void) 
	}

}



extern unsigned long __initdata table_start;

extern unsigned long __meminitdata table_end;

extern unsigned long __meminitdata table_top;

extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



static __ref void *alloc_low_page(unsigned long *phys)

{

	unsigned long pfn = table_end++;

	unsigned long pfn = e820_table_end++;

	void *adr;



	if (after_bootmem) {
@@ -299,7 +299,7 @@ static __ref void *alloc_low_page(unsigned long *phys) 
		return adr;

	}



	if (pfn >= table_top)

	if (pfn >= e820_table_top)

		panic("alloc_low_page: ran out of memory");



	adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE