Piteball/android_kernel_samsung_msm8226
1
0
Fork 0
mirror of https://github.com/S3NEO/android_kernel_samsung_msm8226.git synced 2024-11-07 03:47:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

KVM: s390: rename stfl to kvm_stfl

Browse source 
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:
Heiko Carstens 2008-04-04 15:12:40 +02:00 committed by Avi Kivity
parent 7e8e6ab48d
commit f603f0731f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/s390/kvm/priv.c
View file

@ -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++;