From: Michal Simek <monstr@monstr.eu>
Date: Fri, 23 Sep 2011 07:52:24 +0000 (+0200)
Subject: microblaze: Clear top bit from cnt32_to_63
X-Git-Tag: MMI-PSA29.97-13-9~18175^2~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c6f6f549f46940c2d48eb9618d9d0fe471c5151;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

microblaze: Clear top bit from cnt32_to_63

Top bit is used as garbage and it must be clear
explicitly.
It is causing the problem with soft lookup code
because it checks delays which are long when
top bit is setup.

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index e5550ce4e0eb..af74b1113aab 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -308,7 +308,8 @@ unsigned long long notrace sched_clock(void)
 {
 	if (timer_initialized) {
 		struct clocksource *cs = &clocksource_microblaze;
-		cycle_t cyc = cnt32_to_63(cs->read(NULL));
+
+		cycle_t cyc = cnt32_to_63(cs->read(NULL)) & LLONG_MAX;
 		return clocksource_cyc2ns(cyc, cs->mult, cs->shift);
 	}
 	return 0;