From 2906e8749c0c58f19a5d31429752f718d96b7279 Mon Sep 17 00:00:00 2001
From: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Sun, 30 Oct 2011 15:17:04 +0100
Subject: [PATCH] --- yaml --- r: 272083 b: refs/heads/master c:
 80376f347d70ce5fcfb98105d83624518e0911d6 h: refs/heads/master i:   272081:
 2edfefd82f9458702aae611b426804c8b364419a   272079:
 9214829e4b4d2280a4a576ec47b6388f3019b93a v: v3

---
 [refs]                              |  2 +-
 trunk/arch/s390/include/asm/timex.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6ce67933ed0c..dc50d822369d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 388186bc920d9200202e4d25de66fa95b1b8fc68
+refs/heads/master: 80376f347d70ce5fcfb98105d83624518e0911d6
diff --git a/trunk/arch/s390/include/asm/timex.h b/trunk/arch/s390/include/asm/timex.h
index 88829a40af6f..d610bef9c5e9 100644
--- a/trunk/arch/s390/include/asm/timex.h
+++ b/trunk/arch/s390/include/asm/timex.h
@@ -86,6 +86,17 @@ static inline void get_clock_ext(char *clk)
 	asm volatile("stcke %0" : "=Q" (*clk) : : "cc");
 }
 
+static inline unsigned long long get_clock_fast(void)
+{
+	unsigned long long clk;
+
+	if (test_facility(25))
+		asm volatile(".insn	s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
+	else
+		clk = get_clock();
+	return clk;
+}
+
 static inline unsigned long long get_clock_xt(void)
 {
 	unsigned char clk[16];