Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / s390 / kvm / priv.c

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 1465946325c538a85fe183c0fb1aa83c1ece44d3..c02286c6a9315efcd4936e79a9798f2c16bf256f 100644 (file)
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -151,18 +151,9 @@ static int handle_chsc(struct kvm_vcpu *vcpu)
        return 0;
 }
 
-static unsigned int kvm_stfl(void)
-{
-       asm volatile(
-               "       .insn   s,0xb2b10000,0(0)\n" /* stfl */
-               "0:\n"
-               EX_TABLE(0b, 0b));
-       return S390_lowcore.stfl_fac_list;
-}
-
 static int handle_stfl(struct kvm_vcpu *vcpu)
 {
-       unsigned int facility_list = kvm_stfl();
+       unsigned int facility_list = stfl();
        int rc;
 
        vcpu->stat.instruction_stfl++;