aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/rtc.c
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2006-09-29 04:59:04 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:05 -0400
commit358333a0cb4a6d279806e38d0368b79066dbe5e7 (patch)
treea3f32e874a52aa6874bb8ca5291daa970877d3cc /drivers/char/rtc.c
parent9938406ab6b2558d60c0c7200cc8e12f1ea7104a (diff)
[PATCH] remove unnecessary barrier in rtc_get_rtc_time
Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rtc.c')
-rw-r--r--drivers/char/rtc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index ab6429b4a84e..656f8c0ca52e 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -1262,10 +1262,8 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
1262 * Once the read clears, read the RTC time (again via ioctl). Easy. 1262 * Once the read clears, read the RTC time (again via ioctl). Easy.
1263 */ 1263 */
1264 1264
1265 while (rtc_is_updating() != 0 && jiffies - uip_watchdog < 2*HZ/100) { 1265 while (rtc_is_updating() != 0 && jiffies - uip_watchdog < 2*HZ/100)
1266 barrier();
1267 cpu_relax(); 1266 cpu_relax();
1268 }
1269 1267
1270 /* 1268 /*
1271 * Only the values that we read from the RTC are set. We leave 1269 * Only the values that we read from the RTC are set. We leave