Commit 69a6c312 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Move some kernel globals from asm file to C file. 



This get rid of some undesirable hole in BSS section due to random
order of placement.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 907e193e

arch/mips/kernel/asm-offsets.c

+0 −4
Original line number Diff line number Diff line
@@ -234,10 +234,6 @@ void output_mm_defines(void) 
	constant("#define _PMD_SHIFT     ", PMD_SHIFT);

	constant("#define _PGDIR_SHIFT   ", PGDIR_SHIFT);

	linefeed;

	constant("#define _PGD_ORDER     ", PGD_ORDER);

	constant("#define _PMD_ORDER     ", PMD_ORDER);

	constant("#define _PTE_ORDER     ", PTE_ORDER);

	linefeed;

	constant("#define _PTRS_PER_PGD  ", PTRS_PER_PGD);

	constant("#define _PTRS_PER_PMD  ", PTRS_PER_PMD);

	constant("#define _PTRS_PER_PTE  ", PTRS_PER_PTE);

arch/mips/kernel/head.S

+0 −25
Original line number Diff line number Diff line
@@ -231,28 +231,3 @@ NESTED(smp_bootstrap, 16, sp) 
#endif /* CONFIG_SMP */



	__FINIT
 


	.comm	kernelsp,    NR_CPUS * 8, 8

	.comm	pgd_current, NR_CPUS * 8, 8



	.comm	fw_arg0, SZREG, SZREG		# firmware arguments

	.comm	fw_arg1, SZREG, SZREG

	.comm	fw_arg2, SZREG, SZREG

	.comm	fw_arg3, SZREG, SZREG



	.macro page name, order

	.comm	\name, (_PAGE_SIZE << \order), (_PAGE_SIZE << \order)

	.endm



	/*

	 * On 64-bit we've got three-level pagetables with a slightly

	 * different layout ...

	 */

	page	swapper_pg_dir, _PGD_ORDER

#ifdef CONFIG_64BIT

#if defined(CONFIG_MODULES) && !defined(CONFIG_BUILD_ELF64)

	page	module_pg_dir, _PGD_ORDER

#endif

	page	invalid_pmd_table, _PMD_ORDER

#endif

	page	invalid_pte_table, _PTE_ORDER

arch/mips/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -563,3 +563,6 @@ int __init dsp_disable(char *s) 
}



__setup("nodsp", dsp_disable);



unsigned long kernelsp[NR_CPUS];

unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;

arch/mips/mm/init.c

+15 −0
Original line number Diff line number Diff line
@@ -499,3 +499,18 @@ void free_initmem(void) 
			__pa_symbol(&__init_begin),

			__pa_symbol(&__init_end));

}



unsigned long pgd_current[NR_CPUS];

/*

 * On 64-bit we've got three-level pagetables with a slightly

 * different layout ...

 */

#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))

pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);

#ifdef CONFIG_64BIT

#ifdef MODULE_START

pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);

#endif

pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned(PMD_ORDER);

#endif

pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);