diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:22:33 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:22:33 -0400 |
commit | 303d72a0006c65bb8d16199c75a26338ce723811 (patch) | |
tree | 28e0c39198b0ffc61103b249e83aaa2798ba216c /arch/powerpc/platforms/powermac | |
parent | 6d0124fc06be40deafca043c73a8203c78bbfe45 (diff) |
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>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/time.c | 4 |
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) | |||
113 | req.reply_len); | 113 | req.reply_len); |
114 | now = (req.reply[3] << 24) + (req.reply[4] << 16) | 114 | now = (req.reply[3] << 24) + (req.reply[4] << 16) |
115 | + (req.reply[5] << 8) + req.reply[6]; | 115 | + (req.reply[5] << 8) + req.reply[6]; |
116 | if (now < RTC_OFFSET) | ||
117 | return 0; | ||
118 | return now - RTC_OFFSET; | 116 | return now - RTC_OFFSET; |
119 | } | 117 | } |
120 | 118 | ||
@@ -158,8 +156,6 @@ static unsigned long pmu_get_time(void) | |||
158 | req.reply_len); | 156 | req.reply_len); |
159 | now = (req.reply[0] << 24) + (req.reply[1] << 16) | 157 | now = (req.reply[0] << 24) + (req.reply[1] << 16) |
160 | + (req.reply[2] << 8) + req.reply[3]; | 158 | + (req.reply[2] << 8) + req.reply[3]; |
161 | if (now < RTC_OFFSET) | ||
162 | return 0; | ||
163 | return now - RTC_OFFSET; | 159 | return now - RTC_OFFSET; |
164 | } | 160 | } |
165 | 161 | ||