Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-09-18 23:47:14 +0200
committerTakashi Iwai <tiwai@suse.de>2016-09-19 16:30:51 +0200
commitb5d88ec2dc78a06989a520625c82f2f947c3de88 (patch)
tree9199593d397e8e144f0217dc4093350c499b92f1
parent88a2a8bd859b034aa4f5554c9e05052a27c82eb6 (diff)
kABI workaround for ppc KVM VTB fix (bsc#981367).rpm-4.4.21-64
-rw-r--r--arch/powerpc/include/asm/kvm_book3s.h4
-rw-r--r--arch/powerpc/include/asm/kvm_host.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 7fa59bc0f26d..80b24a21eca7 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -83,7 +83,6 @@ struct kvmppc_vcpu_book3s {
u64 sdr1;
u64 hior;
u64 msr_mask;
- u64 vtb;
#ifdef CONFIG_PPC_BOOK3S_32
u32 vsid_pool[VSID_POOL_SIZE];
u32 vsid_next;
@@ -105,6 +104,9 @@ struct kvmppc_vcpu_book3s {
#endif
int hpte_cache_count;
spinlock_t mmu_lock;
+#ifndef __GENKSYMS__
+ u64 vtb;
+#endif
};
#define VSID_REAL 0x07ffffffffc00000ULL
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 025de30a27ca..e8a3fa9be82f 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -297,8 +297,10 @@ struct kvmppc_vcore {
u32 arch_compat;
ulong pcr;
ulong dpdes; /* doorbell state (POWER8) */
- ulong vtb; /* virtual timebase */
ulong conferring_threads;
+#ifndef __GENKSYMS__
+ ulong vtb; /* virtual timebase */
+#endif
};
#define VCORE_ENTRY_MAP(vc) ((vc)->entry_exit_map & 0xff)
@@ -474,6 +476,7 @@ struct kvm_vcpu_arch {
ulong purr;
ulong spurr;
ulong ic;
+ ulong vtb; /* just a placeholder for kABI compatibility */
ulong dscr;
ulong amr;
ulong uamor;