MIPS: mm: Add set_cpu_context() for ASID assignments
When we gain MMID support we'll be storing MMIDs as atomic64_t values and accessing them via atomic64_* functions. This necessitates that we don't use cpu_context() as the left hand side of an assignment, ie. as a modifiable lvalue. In preparation for this introduce a new set_cpu_context() function & replace all assignments with cpu_context() on their left hand side with an equivalent call to set_cpu_context(). To enforce that cpu_context() should not be used for assignments, we rewrite it as a static inline function. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org
This commit is contained in:
@@ -88,7 +88,17 @@ static inline u64 asid_first_version(unsigned int cpu)
|
||||
return ~asid_version_mask(cpu) + 1;
|
||||
}
|
||||
|
||||
#define cpu_context(cpu, mm) ((mm)->context.asid[cpu])
|
||||
static inline u64 cpu_context(unsigned int cpu, const struct mm_struct *mm)
|
||||
{
|
||||
return mm->context.asid[cpu];
|
||||
}
|
||||
|
||||
static inline void set_cpu_context(unsigned int cpu,
|
||||
struct mm_struct *mm, u64 ctx)
|
||||
{
|
||||
mm->context.asid[cpu] = ctx;
|
||||
}
|
||||
|
||||
#define asid_cache(cpu) (cpu_data[cpu].asid_cache)
|
||||
#define cpu_asid(cpu, mm) \
|
||||
(cpu_context((cpu), (mm)) & cpu_asid_mask(&cpu_data[cpu]))
|
||||
@@ -111,7 +121,7 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm)
|
||||
int i;
|
||||
|
||||
for_each_possible_cpu(i)
|
||||
cpu_context(i, mm) = 0;
|
||||
set_cpu_context(i, mm, 0);
|
||||
|
||||
mm->context.bd_emupage_allocmap = NULL;
|
||||
spin_lock_init(&mm->context.bd_emupage_lock);
|
||||
@@ -175,7 +185,7 @@ drop_mmu_context(struct mm_struct *mm)
|
||||
htw_start();
|
||||
} else {
|
||||
/* will get a new context next time */
|
||||
cpu_context(cpu, mm) = 0;
|
||||
set_cpu_context(cpu, mm, 0);
|
||||
}
|
||||
|
||||
local_irq_restore(flags);
|
||||
|
Reference in New Issue
Block a user