diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-09 10:12:41 +0100 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-06-04 14:33:28 -0700 |
| commit | 438e0d9a9017b3e6d516d7ea14a8cffee85ff8c2 (patch) | |
| tree | a6d5241af611e9bec2af27b4177b061e0d86efdc /arch | |
| parent | 9e7532fb97a90a7055d86967039f955f83be1e70 (diff) | |
Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks"
This reverts commit 45b95235b0ac86cef2ad4480b0618b8778847479.
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 context switching.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit a0a54d37b4b1d1f55d1e81e8ffc223bb85472fa3)
Change-Id: Id3bd7c795bb84269b646e6a1344d1974d85bf094
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/221349
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sang-Hun Lee <sanlee@nvidia.com>
Tested-by: Sang-Hun Lee <sanlee@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c index 8df58300d451..806cc4f63516 100644 --- a/arch/arm/mm/context.c +++ b/arch/arm/mm/context.c @@ -108,7 +108,7 @@ static void reset_context(void *info) struct mm_struct *mm = current->active_mm; smp_rmb(); - asid = cpu_last_asid + cpu; + asid = cpu_last_asid + cpu + 1; flush_context(); set_mm_context(mm, asid); @@ -157,13 +157,13 @@ void __new_context(struct mm_struct *mm) * to start a new version and flush the TLB. */ if (unlikely((asid & ~ASID_MASK) == 0)) { - asid = cpu_last_asid + smp_processor_id(); + asid = cpu_last_asid + smp_processor_id() + 1; flush_context(); #ifdef CONFIG_SMP smp_wmb(); smp_call_function(reset_context, NULL, 1); #endif - cpu_last_asid += NR_CPUS - 1; + cpu_last_asid += NR_CPUS; } set_mm_context(mm, asid); |