From 93dd05c1a8797a2a2d3bf9e7baf7aec9d54295af Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 30 Apr 2008 13:38:43 +0200
Subject: [PATCH] --- yaml --- r: 95335 b: refs/heads/master c:
 484875b11f355b1b54d508a3f4671888f07e643c h: refs/heads/master i:   95333:
 adc15843df234c00c1b19fd2b6c580e089b5fc07   95331:
 d0b7fdd4015078eccc26c8c0fc7ce206c332858a   95327:
 1e4dff0dc9a2910e65489663aa072ed5e7a7af5a v: v3

---
 [refs]                          |  2 +-
 trunk/arch/s390/kernel/setup.c  |  9 ---------
 trunk/arch/s390/kvm/priv.c      | 11 +----------
 trunk/include/asm-s390/system.h | 10 ++++++++++
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 1a695afbd811..7aba997aaef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccf183e469be89e065ed389da9d3f50bd2faa215
+refs/heads/master: 484875b11f355b1b54d508a3f4671888f07e643c
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index a9d18aafa5f4..024180e25e85 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -683,15 +683,6 @@ setup_memory(void)
 #endif
 }
 
-static __init 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 __init __stfle(unsigned long long *list, int doublewords)
 {
 	typedef struct { unsigned long long _[doublewords]; } addrtype;
diff --git a/trunk/arch/s390/kvm/priv.c b/trunk/arch/s390/kvm/priv.c
index 1465946325c5..c02286c6a931 100644
--- a/trunk/arch/s390/kvm/priv.c
+++ b/trunk/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++;
diff --git a/trunk/include/asm-s390/system.h b/trunk/include/asm-s390/system.h
index 92098df4d6e3..79bdbf4b33a7 100644
--- a/trunk/include/asm-s390/system.h
+++ b/trunk/include/asm-s390/system.h
@@ -16,6 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/setup.h>
 #include <asm/processor.h>
+#include <asm/lowcore.h>
 
 #ifdef __KERNEL__
 
@@ -422,6 +423,15 @@ extern void smp_ctl_clear_bit(int cr, int bit);
 
 #endif /* CONFIG_SMP */
 
+static inline 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;
+}
+
 extern void (*_machine_restart)(char *command);
 extern void (*_machine_halt)(void);
 extern void (*_machine_power_off)(void);