diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
commit | 79dbf9d1a443fc015e05dbeb5ab610059c6d9bf1 (patch) | |
tree | 044b23d8cb4827763dc0728dbaa76c4cd0eb7ac2 /drivers/tty/tty_io.c | |
parent | de507154419bcaf3c135b94ba3bbb3f3a6464447 (diff) | |
parent | c554f06fc801004f3fc3b162c490d8fdf4e79725 (diff) |
Merge branch 'tracking-linux-3.9.y' into merge-linux-linaro-core-trackingllct-20130508.0
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r-- | drivers/tty/tty_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index b0452688308c..a9cd0b9353d3 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -941,10 +941,10 @@ void start_tty(struct tty_struct *tty) EXPORT_SYMBOL(start_tty); +/* We limit tty time update visibility to every 8 seconds or so. */ static void tty_update_time(struct timespec *time) { - unsigned long sec = get_seconds(); - sec -= sec % 60; + unsigned long sec = get_seconds() & ~7; if ((long)(sec - time->tv_sec) > 0) time->tv_sec = sec; } |