diff options
-rw-r--r-- | arch/mips/cavium-octeon/csrc-octeon.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c index 0bf4bbe04ae2..36400d23ff59 100644 --- a/arch/mips/cavium-octeon/csrc-octeon.c +++ b/arch/mips/cavium-octeon/csrc-octeon.c | |||
@@ -53,7 +53,6 @@ static struct clocksource clocksource_mips = { | |||
53 | unsigned long long notrace sched_clock(void) | 53 | unsigned long long notrace sched_clock(void) |
54 | { | 54 | { |
55 | /* 64-bit arithmatic can overflow, so use 128-bit. */ | 55 | /* 64-bit arithmatic can overflow, so use 128-bit. */ |
56 | #if (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 3)) | ||
57 | u64 t1, t2, t3; | 56 | u64 t1, t2, t3; |
58 | unsigned long long rv; | 57 | unsigned long long rv; |
59 | u64 mult = clocksource_mips.mult; | 58 | u64 mult = clocksource_mips.mult; |
@@ -73,13 +72,6 @@ unsigned long long notrace sched_clock(void) | |||
73 | : [cnt] "r" (cnt), [mult] "r" (mult), [shift] "r" (shift) | 72 | : [cnt] "r" (cnt), [mult] "r" (mult), [shift] "r" (shift) |
74 | : "hi", "lo"); | 73 | : "hi", "lo"); |
75 | return rv; | 74 | return rv; |
76 | #else | ||
77 | /* GCC > 4.3 do it the easy way. */ | ||
78 | unsigned int __attribute__((mode(TI))) t; | ||
79 | t = read_c0_cvmcount(); | ||
80 | t = t * clocksource_mips.mult; | ||
81 | return (unsigned long long)(t >> clocksource_mips.shift); | ||
82 | #endif | ||
83 | } | 75 | } |
84 | 76 | ||
85 | void __init plat_time_init(void) | 77 | void __init plat_time_init(void) |