From: David Daney <david.daney@xxxxxxxxxx>
... and their accessors in asm-offsets.c
Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
---
arch/mips/include/asm/processor.h | 6 ++++++
arch/mips/kernel/asm-offsets.c | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index 1470b7b..e0aa198 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -198,6 +198,7 @@ typedef struct {
#define ARCH_MIN_TASKALIGN 8
struct mips_abi;
+struct kvm_vcpu;
/*
* If you change thread_struct remember to change the #defines below too!
@@ -230,6 +231,11 @@ struct thread_struct {
unsigned long cp0_badvaddr; /* Last user fault */
unsigned long cp0_baduaddr; /* Last kernel fault accessing USEG */
unsigned long error_code;
+#ifdef CONFIG_KVM_MIPSVZ
+ struct kvm_vcpu *vcpu;
+ unsigned int mm_asid;
+ unsigned int guest_asid;
+#endif
#ifdef CONFIG_CPU_CAVIUM_OCTEON
struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128)));
struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128)));
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index c5cc28f..37fd9e2 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -132,6 +132,11 @@ void output_thread_defines(void)
thread.cp0_baduaddr);
OFFSET(THREAD_ECODE, task_struct, \
thread.error_code);
+#ifdef CONFIG_KVM_MIPSVZ
+ OFFSET(THREAD_VCPU, task_struct, thread.vcpu);
+ OFFSET(THREAD_MM_ASID, task_struct, thread.mm_asid);
+ OFFSET(THREAD_GUEST_ASID, task_struct, thread.guest_asid);
+#endif
BLANK();
}
--
1.7.11.7
