Commit 00c52bda authored by Catalin Marinas's avatar Catalin Marinas

Remove the context.id from asm-offsets.c when !MMU

There is no MMU context switching on MMU-less systems.
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 52f675b3
...@@ -88,7 +88,7 @@ int main(void) ...@@ -88,7 +88,7 @@ int main(void)
DEFINE(S_OLD_R0, offsetof(struct pt_regs, ARM_ORIG_r0)); DEFINE(S_OLD_R0, offsetof(struct pt_regs, ARM_ORIG_r0));
DEFINE(S_FRAME_SIZE, sizeof(struct pt_regs)); DEFINE(S_FRAME_SIZE, sizeof(struct pt_regs));
BLANK(); BLANK();
#if __LINUX_ARM_ARCH__ >= 6 #if defined(CONFIG_MMU) && __LINUX_ARM_ARCH__ >= 6
DEFINE(MM_CONTEXT_ID, offsetof(struct mm_struct, context.id)); DEFINE(MM_CONTEXT_ID, offsetof(struct mm_struct, context.id));
BLANK(); BLANK();
#endif #endif
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
void __check_kvm_seq(struct mm_struct *mm); void __check_kvm_seq(struct mm_struct *mm);
#if __LINUX_ARM_ARCH__ >= 6 #if defined(CONFIG_MMU) && __LINUX_ARM_ARCH__ >= 6
/* /*
* On ARMv6, we have the following structure in the Context ID: * On ARMv6, we have the following structure in the Context ID:
...@@ -58,8 +58,10 @@ static inline void check_context(struct mm_struct *mm) ...@@ -58,8 +58,10 @@ static inline void check_context(struct mm_struct *mm)
static inline void check_context(struct mm_struct *mm) static inline void check_context(struct mm_struct *mm)
{ {
#ifdef CONFIG_MMU
if (unlikely(mm->context.kvm_seq != init_mm.context.kvm_seq)) if (unlikely(mm->context.kvm_seq != init_mm.context.kvm_seq))
__check_kvm_seq(mm); __check_kvm_seq(mm);
#endif
} }
#define init_new_context(tsk,mm) 0 #define init_new_context(tsk,mm) 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment