aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-26 17:22:33 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-26 17:22:33 +1000
commit303d72a0006c65bb8d16199c75a26338ce723811 (patch)
tree28e0c39198b0ffc61103b249e83aaa2798ba216c
parentpowerpc: Fix interrupt-tree parsing (diff)
downloadlinux-dev-303d72a0006c65bb8d16199c75a26338ce723811.tar.xz
linux-dev-303d72a0006c65bb8d16199c75a26338ce723811.zip
powerpc: Don't limit pmac_get_rtc_time to return only positive values
If the machine's clock is set to a bogus value, this check resulted in userland waiting effectively forever for the RTC value to change, so remove the check. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/powermac/time.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 82982bf6453c..5947b21a8588 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -113,8 +113,6 @@ static unsigned long cuda_get_time(void)
req.reply_len);
now = (req.reply[3] << 24) + (req.reply[4] << 16)
+ (req.reply[5] << 8) + req.reply[6];
- if (now < RTC_OFFSET)
- return 0;
return now - RTC_OFFSET;
}
@@ -158,8 +156,6 @@ static unsigned long pmu_get_time(void)
req.reply_len);
now = (req.reply[0] << 24) + (req.reply[1] << 16)
+ (req.reply[2] << 8) + req.reply[3];
- if (now < RTC_OFFSET)
- return 0;
return now - RTC_OFFSET;
}