5 files changed, 18 insertions, 7 deletions

diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1
index 6587bd3984dc..38681f8f1c22 100644
--- a/usr.bin/procstat/procstat.1
+++ b/usr.bin/procstat/procstat.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 23, 2012
+.Dd July 11, 2012
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -418,6 +418,8 @@ default
 device
 .It ph
 physical
+.It sg
+scatter/gather
 .It sw
 swap
 .It vn
@@ -433,6 +435,10 @@ copy-on-write
 needs copy
 .It S
 one or more superpage mappings are used
+.It D
+grows down (top-down stack)
+.It U
+grows up (bottom-up stack)
 .El
 .Sh EXIT STATUS
 .Ex -std
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index 9bf7afb0804b..b78e13a4d598 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -231,9 +231,11 @@ procstat_auxv(struct kinfo_proc *kipp)
 			else
 				PRINT(AT_STACKPROT, %s, "EXECUTABLE");
 			break;
-		case AT_COUNT:
-			PRINT(AT_COUNT, %ld, (long)auxv[i].a_un.a_val);
+#ifdef AT_TIMEKEEP
+		case AT_TIMEKEEP:
+			PRINT(AT_TIMEKEEP, %p, auxv[i].a_un.a_ptr);
 			break;
+#endif
 		default:
 			PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val);
 			break;
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 4c1905c919f5..126ef7e4587a 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -476,4 +476,5 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 
 		printf("\n");
 	}
+	procstat_freefiles(procstat, head);
 }
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index c5429c4dde94..68230e5abeec 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -66,8 +66,8 @@ static struct {
 #error "Resource limits have grown. Add new entries to rlimit_param[]."
 #endif
 
-static
-const char *humanize_rlimit(int indx, rlim_t limit)
+static const char *
+humanize_rlimit(int indx, rlim_t limit)
 {
 	static char buf[14];
 	int scale;
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 33d07598d420..66f29aece9bc 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -50,7 +50,7 @@ procstat_vm(struct kinfo_proc *kipp)
 
 	ptrwidth = 2*sizeof(void *) + 2;
 	if (!hflag)
-		printf("%5s %*s %*s %3s %4s %4s %3s %3s %3s %-2s %-s\n",
+		printf("%5s %*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n",
 		    "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
 		    "PRES", "REF", "SHD", "FL", "TP", "PATH");
 
@@ -72,7 +72,9 @@ procstat_vm(struct kinfo_proc *kipp)
 		printf("%-1s", kve->kve_flags & KVME_FLAG_COW ? "C" : "-");
 		printf("%-1s", kve->kve_flags & KVME_FLAG_NEEDS_COPY ? "N" :
 		    "-");
-		printf("%-1s ", kve->kve_flags & KVME_FLAG_SUPER ? "S" : "-");
+		printf("%-1s", kve->kve_flags & KVME_FLAG_SUPER ? "S" : "-");
+		printf("%-1s ", kve->kve_flags & KVME_FLAG_GROWS_UP ? "U" :
+		    kve->kve_flags & KVME_FLAG_GROWS_DOWN ? "D" : "-");
 		switch (kve->kve_type) {
 		case KVME_TYPE_NONE:
 			str = "--";