From: Tomas Janousek Date: Mon, 16 Jul 2007 06:39:42 +0000 (-0700) Subject: Use boot based time for uptime in /proc X-Git-Tag: v2.6.23-rc1~953 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62141414a55ff3f1410b27db2a95224446e77a4;p=pandora-kernel.git Use boot based time for uptime in /proc Commit 411187fb05cd11676b0979d9fbf3291db69dbce2 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: Tomas Janousek Acked-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed