diff options
| author | Russell King | 2013-06-29 11:44:43 +0100 |
|---|---|---|
| committer | Russell King | 2013-06-29 11:44:43 +0100 |
| commit | 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 (patch) | |
| tree | d0f196c53d209f44190fd8a6481823b7770866e6 /arch/arm/mm/context.c | |
| parent | cbd379b10019617457bda31eb243890f4377fa3e (diff) | |
| parent | 809e660f438fc5a69bf57630a85bcd8112263f37 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Diffstat (limited to 'arch/arm/mm/context.c')
| -rw-r--r-- | arch/arm/mm/context.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c index eeab06ebd06e..b55b1015724b 100644 --- a/arch/arm/mm/context.c +++ b/arch/arm/mm/context.c @@ -20,6 +20,7 @@ #include <asm/smp_plat.h> #include <asm/thread_notify.h> #include <asm/tlbflush.h> +#include <asm/proc-fns.h> /* * On ARMv6, we have the following structure in the Context ID: @@ -79,17 +80,11 @@ void a15_erratum_get_cpumask(int this_cpu, struct mm_struct *mm, #ifdef CONFIG_ARM_LPAE static void cpu_set_reserved_ttbr0(void) { - unsigned long ttbl = __pa(swapper_pg_dir); - unsigned long ttbh = 0; - /* * Set TTBR0 to swapper_pg_dir which contains only global entries. The * ASID is set to 0. */ - asm volatile( - " mcrr p15, 0, %0, %1, c2 @ set TTBR0\n" - : - : "r" (ttbl), "r" (ttbh)); + cpu_set_ttbr(0, __pa(swapper_pg_dir)); isb(); } #else |