Skip to content
Snippets Groups Projects
Commit d6214141 authored by Tomas Janousek's avatar Tomas Janousek Committed by Linus Torvalds
Browse files

Use boot based time for uptime in /proc


Commit 411187fb caused uptime not to increase
during suspend.  This may cause confusion so I restore the old behaviour by
using the boot based time instead of monotonic for uptime.

Signed-off-by: default avatarTomas Janousek <tjanouse@redhat.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 924b42d5
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment