From owner-svn-src-stable-9@FreeBSD.ORG  Mon Nov 19 18:18:24 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 97BD7B93;
 Mon, 19 Nov 2012 18:18:24 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 775B98FC13;
 Mon, 19 Nov 2012 18:18:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJIIOkO017304;
 Mon, 19 Nov 2012 18:18:24 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJIIOLH017303;
 Mon, 19 Nov 2012 18:18:24 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201211191818.qAJIIOLH017303@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 19 Nov 2012 18:18:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243293 - stable/9/usr.bin/w
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 18:18:24 -0000

Author: emaste
Date: Mon Nov 19 18:18:24 2012
New Revision: 243293
URL: http://svnweb.freebsd.org/changeset/base/243293

Log:
  MFC r241484: Use CLOCK_UPTIME to get the uptime.

Modified:
  stable/9/usr.bin/w/w.c
Directory Properties:
  stable/9/usr.bin/w/   (props changed)

Modified: stable/9/usr.bin/w/w.c
==============================================================================
--- stable/9/usr.bin/w/w.c	Mon Nov 19 18:09:00 2012	(r243292)
+++ stable/9/usr.bin/w/w.c	Mon Nov 19 18:18:24 2012	(r243293)
@@ -448,7 +448,7 @@ pr_header(time_t *nowp, int nusers)
 	/*
 	 * Print how long system has been up.
 	 */
-	if (clock_gettime(CLOCK_MONOTONIC, &tp) != -1) {
+	if (clock_gettime(CLOCK_UPTIME, &tp) != -1) {
 		uptime = tp.tv_sec;
 		if (uptime > 60)
 			uptime += 30;