Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID"
commit07989b7ad63af424886ff922fd3bcca9e00ffa78
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Jun 2011 09:10:27 +0000 (9 10:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Jun 2011 09:13:04 +0000 (9 10:13 +0100)
tree5c3107ae9a50906de180addf6a111dab60e2427d
parent17ee083b7897ab27b4949c42de805889ebd2b4c5
Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID"

This reverts commit 52af9c6cd863fe37d1103035ec7ee22ac1296458.

Will Deacon reports that:

 In 52af9c6c ("ARM: 6943/1: mm: use TTBR1 instead of reserved context ID")
 I updated the ASID rollover code to use only the kernel page tables
 whilst updating the ASID.

 Unfortunately, the code to restore the user page tables was part of a
 later patch which isn't yet in mainline, so this leaves the code
 quite broken.

We're also in the process of eliminating __ARCH_WANT_INTERRUPTS_ON_CTXSW
from ARM, so lets revert these until we can properly sort out what we're
doing with the ARM context switching.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/context.c
arch/arm/mm/proc-v7.S