From 7c78975425fb071269f1c9327f000cc9eed08184 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 29 Jul 2010 00:13:07 +0200 Subject: [PATCH] --- yaml --- r: 204471 b: refs/heads/master c: 5c8974538afd97990d3730ef6fea731a34ef1f85 h: refs/heads/master i: 204469: cb11b3846deacafd7aedf56c247d822b6259a86f 204467: 421415225b8f0b487d4d593905ba2fc30a5c02f7 204463: e9f6e59ca82574a1a8f758cb50f0df2fd4e03359 v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/csrc-octeon.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 32b914a69e61..13b1cf386c57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e10c53a5f31ae1535e13ef51d6615662c36d36c6 +refs/heads/master: 5c8974538afd97990d3730ef6fea731a34ef1f85 diff --git a/trunk/arch/mips/cavium-octeon/csrc-octeon.c b/trunk/arch/mips/cavium-octeon/csrc-octeon.c index 0bf4bbe04ae2..36400d23ff59 100644 --- a/trunk/arch/mips/cavium-octeon/csrc-octeon.c +++ b/trunk/arch/mips/cavium-octeon/csrc-octeon.c @@ -53,7 +53,6 @@ static struct clocksource clocksource_mips = { unsigned long long notrace sched_clock(void) { /* 64-bit arithmatic can overflow, so use 128-bit. */ -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 3)) u64 t1, t2, t3; unsigned long long rv; u64 mult = clocksource_mips.mult; @@ -73,13 +72,6 @@ unsigned long long notrace sched_clock(void) : [cnt] "r" (cnt), [mult] "r" (mult), [shift] "r" (shift) : "hi", "lo"); return rv; -#else - /* GCC > 4.3 do it the easy way. */ - unsigned int __attribute__((mode(TI))) t; - t = read_c0_cvmcount(); - t = t * clocksource_mips.mult; - return (unsigned long long)(t >> clocksource_mips.shift); -#endif } void __init plat_time_init(void)