---

yaml --- r: 272083 b: refs/heads/master c: 80376f3 h: refs/heads/master i: 272081: 2edfefd 272079: 9214829 v: v3
git-mirror · Oct 30, 2011 · 2906e87 · 2906e87
1 parent 0bbc967
commit 2906e87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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];