---

yaml --- r: 93864 b: refs/heads/master c: f603f07 h: refs/heads/master v: v3
git-mirror · Apr 27, 2008 · 34169a4 · 34169a4
1 parent aa62c05
commit 34169a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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++;