Messages in this thread Patch in this message | | | From | Avi Kivity <> | Subject | [PATCH 26/45] KVM: s390: rename stfl to kvm_stfl | Date | Thu, 17 Apr 2008 12:10:31 +0300 |
| |
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Temporarily rename this function to avoid merge conflicts and/or dependencies. This function will be removed as soon as git-s390 and kvm.git are finally upstream.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com> --- arch/s390/kvm/priv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index c97e904..1465946 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c @@ -151,7 +151,7 @@ static int handle_chsc(struct kvm_vcpu *vcpu) return 0; } -static unsigned int stfl(void) +static unsigned int kvm_stfl(void) { asm volatile( " .insn s,0xb2b10000,0(0)\n" /* stfl */ @@ -162,7 +162,7 @@ static unsigned int stfl(void) static int handle_stfl(struct kvm_vcpu *vcpu) { - unsigned int facility_list = stfl(); + unsigned int facility_list = kvm_stfl(); int rc; vcpu->stat.instruction_stfl++; -- 1.5.5
| |