From owner-svn-src-all@FreeBSD.ORG  Tue Apr 20 20:21:01 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EC96106564A;
	Tue, 20 Apr 2010 20:21:01 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D6288FC0A;
	Tue, 20 Apr 2010 20:21:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KKL1FP033769;
	Tue, 20 Apr 2010 20:21:01 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KKL1WO033766;
	Tue, 20 Apr 2010 20:21:01 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201004202021.o3KKL1WO033766@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Tue, 20 Apr 2010 20:21:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206912 - stable/7/contrib/top
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Apr 2010 20:21:01 -0000

Author: brucec
Date: Tue Apr 20 20:21:01 2010
New Revision: 206912
URL: http://svn.freebsd.org/changeset/base/206912

Log:
  MFC r205119 and r206056:
  
  Prevent the SIZE field being corrupted when a process allocates more than
  2TB.
  
  PR:	bin/129706
  Submitted by:	brucec
  Approved by:	rrs (mentor)

Modified:
  stable/7/contrib/top/utils.c
  stable/7/contrib/top/utils.h
Directory Properties:
  stable/7/contrib/top/   (props changed)

Modified: stable/7/contrib/top/utils.c
==============================================================================
--- stable/7/contrib/top/utils.c	Tue Apr 20 20:19:19 2010	(r206911)
+++ stable/7/contrib/top/utils.c	Tue Apr 20 20:21:01 2010	(r206912)
@@ -476,7 +476,7 @@ int amt;
 
 char *format_k2(amt)
 
-int amt;
+unsigned long long amt;
 
 {
     static char retarray[NUM_STRINGS][16];

Modified: stable/7/contrib/top/utils.h
==============================================================================
--- stable/7/contrib/top/utils.h	Tue Apr 20 20:19:19 2010	(r206911)
+++ stable/7/contrib/top/utils.h	Tue Apr 20 20:21:01 2010	(r206912)
@@ -21,4 +21,4 @@ long percentages();
 char *errmsg();
 char *format_time();
 char *format_k();
-char *format_k2();
+char *format_k2(unsigned long long);