From owner-p4-projects@FreeBSD.ORG  Fri Aug 15 16:24:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D017106572D; Fri, 15 Aug 2008 16:24:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F409A106567B
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 16:24:37 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C128D8FC1E
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 16:24:36 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGOaAJ010553
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 16:24:36 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGOa7u010551
	for perforce@freebsd.org; Fri, 15 Aug 2008 16:24:36 GMT
	(envelope-from zec@tel.fer.hr)
Date: Fri, 15 Aug 2008 16:24:36 GMT
Message-Id: <200808151624.m7FGOa7u010551@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147468 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Aug 2008 16:24:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=147468

Change 147468 by zec@zec_tpx32 on 2008/08/15 16:24:23

	Attempt to unbreak build.

Affected files ...

.. //depot/projects/vimage-devel/src/sys/kern/tty_info.c#2 edit

Differences ...

==== //depot/projects/vimage-devel/src/sys/kern/tty_info.c#2 (text+ko) ====

@@ -43,6 +43,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/tty_info.c,v 1.1 2008/07/25 14:31:00 ed Exp $");
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -51,6 +53,7 @@
 #include <sys/sched.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
+#include <sys/vimage.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -213,6 +216,7 @@
 void
 ttyinfo(struct tty *tp)
 {
+	INIT_VPROCG(TD_TO_VPROCG(curthread));	/* XXX */
 	struct timeval utime, stime;
 	struct proc *p, *pick;
 	struct thread *td, *picktd;
@@ -227,7 +231,7 @@
 		return;
 
 	/* Print load average. */
-	load = (averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT;
+	load = (V_averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT;
 	ttyprintf(tp, "load: %d.%02d ", load / 100, load % 100);
 
 	/*