aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMichael Mueller <mimu@linux.vnet.ibm.com>2014-03-13 14:29:09 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-04-22 07:24:53 -0400
commita86dcc2482cf29ffcf6fbc174ce55e4f5f18cd8b (patch)
tree825e1fb4b8ef8bd506c3d72e69ac4c95d415b56e /arch/s390
parent67335e63c9ef59e97b45a08b4a6a93767762031d (diff)
KVM: s390: replace TDB_ADDR by __LC_PGM_TDB
The generically assembled low core labels already contain the address for the TDB. Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/intercept.c3
-rw-r--r--arch/s390/kvm/kvm-s390.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index f61c800a2d2c..f39160406efa 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -16,6 +16,7 @@
16#include <linux/pagemap.h> 16#include <linux/pagemap.h>
17 17
18#include <asm/kvm_host.h> 18#include <asm/kvm_host.h>
19#include <asm/asm-offsets.h>
19 20
20#include "kvm-s390.h" 21#include "kvm-s390.h"
21#include "gaccess.h" 22#include "gaccess.h"
@@ -193,7 +194,7 @@ static int handle_prog(struct kvm_vcpu *vcpu)
193 if (current->thread.per_flags & PER_FLAG_NO_TE) 194 if (current->thread.per_flags & PER_FLAG_NO_TE)
194 goto skip_itdb; 195 goto skip_itdb;
195 itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba; 196 itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba;
196 rc = write_guest_lc(vcpu, TDB_ADDR, itdb, sizeof(*itdb)); 197 rc = write_guest_lc(vcpu, __LC_PGM_TDB, itdb, sizeof(*itdb));
197 if (rc) 198 if (rc)
198 return rc; 199 return rc;
199 memset(itdb, 0, sizeof(*itdb)); 200 memset(itdb, 0, sizeof(*itdb));
diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index c93ed5fabfbc..9b5680d1f6cc 100644
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -28,7 +28,6 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu);
28 28
29/* Transactional Memory Execution related macros */ 29/* Transactional Memory Execution related macros */
30#define IS_TE_ENABLED(vcpu) ((vcpu->arch.sie_block->ecb & 0x10)) 30#define IS_TE_ENABLED(vcpu) ((vcpu->arch.sie_block->ecb & 0x10))
31#define TDB_ADDR 0x1800UL
32#define TDB_FORMAT1 1 31#define TDB_FORMAT1 1
33#define IS_ITDB_VALID(vcpu) ((*(char *)vcpu->arch.sie_block->itdba == TDB_FORMAT1)) 32#define IS_ITDB_VALID(vcpu) ((*(char *)vcpu->arch.sie_block->itdba == TDB_FORMAT1))
34 33