mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 12:49:08 +00:00
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: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
7e8e6ab48d
commit
f603f0731f
@ -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++;
|
||||
|
Loading…
Reference in New Issue
Block a user