From: Andrew Morton <akpm@linux-foundation.org>

arch/s390/kvm/priv.c:155: error: redefinition of 'stfl'
include/asm/system.h:427: error: previous definition of 'stfl' was here

let's remove the git-kvm one.

Cc: Avi Kivity <avi@qumranet.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Carsten Otte <cotte@freenet.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/s390/kvm/priv.c |    9 ---------
 1 file changed, 9 deletions(-)

diff -puN arch/s390/kvm/priv.c~git-kvm-vs-git-s390 arch/s390/kvm/priv.c
--- a/arch/s390/kvm/priv.c~git-kvm-vs-git-s390
+++ a/arch/s390/kvm/priv.c
@@ -151,15 +151,6 @@ static int handle_chsc(struct kvm_vcpu *
 	return 0;
 }
 
-static unsigned int 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 = stfl();
_