summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2008-04-04 15:12:40 +0200
committerAvi Kivity <avi@qumranet.com>2008-04-27 12:00:59 +0300
commitf603f0731f43421403160f5f8b12e90f2e51f064 (patch)
tree5e8bbc51d2a7be8b58e310689cebee2a6881f128 /arch/s390/kvm
parent7e8e6ab48d78147f69c1ba2d6a362f8d33254468 (diff)
downloadop-kernel-dev-f603f0731f43421403160f5f8b12e90f2e51f064.zip
op-kernel-dev-f603f0731f43421403160f5f8b12e90f2e51f064.tar.gz
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>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/priv.c4
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++;
OpenPOWER on IntegriCloud