Merge "arm64: kaslr: use callee saved register to preserve SCTLR across C call"

 */

 */

	.section	".idmap.text", "ax"

	.section	".idmap.text", "ax"

ENTRY(__enable_mmu)

ENTRY(__enable_mmu)

	mrs	x18, sctlr_el1			// preserve old SCTLR_EL1 value

	mrs	x22, sctlr_el1			// preserve old SCTLR_EL1 value

	mrs	x1, ID_AA64MMFR0_EL1

	mrs	x1, ID_AA64MMFR0_EL1

	ubfx	x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4

	ubfx	x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4

	cmp	x2, #ID_AA64MMFR0_TGRAN_SUPPORTED

	cmp	x2, #ID_AA64MMFR0_TGRAN_SUPPORTED

	 * to take into account by discarding the current kernel mapping and

	 * to take into account by discarding the current kernel mapping and

	 * creating a new one.

	 * creating a new one.

	 */

	 */

	msr	sctlr_el1, x18			// disable the MMU

	msr	sctlr_el1, x22			// disable the MMU

	isb

	isb

	bl	__create_page_tables		// recreate kernel mapping

	bl	__create_page_tables		// recreate kernel mapping