---

yaml --- r: 88423 b: refs/heads/master c: c0015f9 h: refs/heads/master i: 88421: fae0476 88419: 03c7bdf 88415: 81dc615 v: v3
git-mirror · Apr 17, 2008 · 918c685 · 918c685
1 parent 17749e6
commit 918c685
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7c8bd6dc6540aa3275c0ad9f657401985c00e9
+refs/heads/master: c0015f91d8414f55d2debfe9984a04b98b48f087
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
@@ -66,7 +66,7 @@ static u64 xtime_cc;
  */
 unsigned long long sched_clock(void)
 {
-	return ((get_clock() - jiffies_timer_cc) * 125) >> 9;
+	return ((get_clock_xt() - jiffies_timer_cc) * 125) >> 9;
 }
 
 /*

diff --git a/trunk/include/asm-s390/timex.h b/trunk/include/asm-s390/timex.h
@@ -62,16 +62,18 @@ static inline unsigned long long get_clock (void)
 	return clk;
 }
 
-static inline void get_clock_extended(void *dest)
+static inline unsigned long long get_clock_xt(void)
 {
-	typedef struct { unsigned long long clk[2]; } __clock_t;
+	unsigned char clk[16];
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-	asm volatile("stcke %0" : "=Q" (*((__clock_t *)dest)) : : "cc");
+	asm volatile("stcke %0" : "=Q" (clk) : : "cc");
 #else /* __GNUC__ */
-	asm volatile("stcke 0(%1)" : "=m" (*((__clock_t *)dest))
-				   : "a" ((__clock_t *)dest) : "cc");
+	asm volatile("stcke 0(%1)" : "=m" (clk)
+				   : "a" (clk) : "cc");
 #endif /* __GNUC__ */
+
+	return *((unsigned long long *)&clk[1]);
 }
 
 static inline cycles_t get_cycles(void)
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ static u64 xtime_cc; @@
      */
     unsigned long long sched_clock(void)
     {
-    	return ((get_clock() - jiffies_timer_cc) * 125) >> 9;
+    	return ((get_clock_xt() - jiffies_timer_cc) * 125) >> 9;
     }
     /*
@@ Expand Down @@