From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 14 Apr 2015 21:28:25 +0000 (+0100)
Subject: Merge branches 'misc', 'vdso' and 'fixes' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c848791f0336914a3081ea3fe029cf177d81de81;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'misc', 'vdso' and 'fixes' into for-next

Conflicts:
	arch/arm/mm/proc-macros.S
---

c848791f0336914a3081ea3fe029cf177d81de81
diff --cc arch/arm/mm/proc-macros.S
index 0f13b5f9281e,082b9f2f7e90,d081c9d9420d..c671f345266a
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@@@ -331,7 -331,3 -331,27 +331,31 @@@@ ENTRY(\name\()_tlb_fns
   	.globl	\x
   	.equ	\x, \y
   .endm
 + 
 ++.macro	initfn, func, base
 ++	.long	\func - \base
 ++.endm
+++
++ 	/*
++ 	 * Macro to calculate the log2 size for the protection region
++ 	 * registers. This calculates rd = log2(size) - 1.  tmp must
++ 	 * not be the same register as rd.
++ 	 */
++ .macro	pr_sz, rd, size, tmp
++ 	mov	\tmp, \size, lsr #12
++ 	mov	\rd, #11
++ 1:	movs	\tmp, \tmp, lsr #1
++ 	addne	\rd, \rd, #1
++ 	bne	1b
++ .endm
++ 
++ 	/*
++ 	 * Macro to generate a protection region register value
++ 	 * given a pre-masked address, size, and enable bit.
++ 	 * Corrupts size.
++ 	 */
++ .macro	pr_val, dest, addr, size, enable
++ 	pr_sz	\dest, \size, \size		@ calculate log2(size) - 1
++ 	orr	\dest, \addr, \dest, lsl #1	@ mask in the region size
++ 	orr	\dest, \dest, \enable
++ .endm