Commit f603f073 authored by Heiko Carstens's avatar Heiko Carstens Committed by Avi Kivity

KVM: s390: rename stfl to kvm_stfl

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 7e8e6ab4
......@@ -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++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment