From 34169a4153a650554e15a080ca7480a35922da39 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 4 Apr 2008 15:12:40 +0200 Subject: [PATCH] --- yaml --- r: 93864 b: refs/heads/master c: f603f0731f43421403160f5f8b12e90f2e51f064 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/priv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f278754dcd80..8bc144931908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e8e6ab48d78147f69c1ba2d6a362f8d33254468 +refs/heads/master: f603f0731f43421403160f5f8b12e90f2e51f064 diff --git a/trunk/arch/s390/kvm/priv.c b/trunk/arch/s390/kvm/priv.c index c97e904ca3b3..1465946325c5 100644 --- a/trunk/arch/s390/kvm/priv.c +++ b/trunk/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++;