Commit a86dcc24 authored Mar 13, 2014 by Michael Mueller Committed by Christian Borntraeger Apr 22, 2014

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>

parent 67335e63

arch/s390/kvm/intercept.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	#include <linux/pagemap.h>		#include <linux/pagemap.h>

	#include <asm/kvm_host.h>		#include <asm/kvm_host.h>
			#include <asm/asm-offsets.h>

	#include "kvm-s390.h"		#include "kvm-s390.h"
	#include "gaccess.h"		#include "gaccess.h"
	@@ -193,7 +194,7 @@ static int handle_prog(struct kvm_vcpu *vcpu)
	if (current->thread.per_flags & PER_FLAG_NO_TE)		if (current->thread.per_flags & PER_FLAG_NO_TE)
	goto skip_itdb;		goto skip_itdb;
	itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba;		itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba;
	rc = write_guest_lc(vcpu, TDB_ADDR, itdb, sizeof(*itdb));		rc = write_guest_lc(vcpu, __LC_PGM_TDB, itdb, sizeof(*itdb));
	if (rc)		if (rc)
	return rc;		return rc;
	memset(itdb, 0, sizeof(*itdb));		memset(itdb, 0, sizeof(*itdb));

arch/s390/kvm/kvm-s390.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu);

	/* Transactional Memory Execution related macros */		/* Transactional Memory Execution related macros */
	#define IS_TE_ENABLED(vcpu) ((vcpu->arch.sie_block->ecb & 0x10))		#define IS_TE_ENABLED(vcpu) ((vcpu->arch.sie_block->ecb & 0x10))
	#define TDB_ADDR 0x1800UL
	#define TDB_FORMAT1 1		#define TDB_FORMAT1 1
	#define IS_ITDB_VALID(vcpu) (((char )vcpu->arch.sie_block->itdba == TDB_FORMAT1))		#define IS_ITDB_VALID(vcpu) (((char )vcpu->arch.sie_block->itdba == TDB_FORMAT1))