From owner-p4-projects@FreeBSD.ORG  Fri Aug 13 13:25:53 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 898C51065693; Fri, 13 Aug 2010 13:25:53 +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 4E3041065696
	for <perforce@freebsd.org>; Fri, 13 Aug 2010 13:25:53 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A8198FC0C
	for <perforce@freebsd.org>; Fri, 13 Aug 2010 13:25:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7DDPrT6028670
	for <perforce@freebsd.org>; Fri, 13 Aug 2010 13:25:53 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7DDPr1L028667
	for perforce@freebsd.org; Fri, 13 Aug 2010 13:25:53 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 13 Aug 2010 13:25:53 GMT
Message-Id: <201008131325.o7DDPr1L028667@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182356 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 13 Aug 2010 13:25:53 -0000

http://p4web.freebsd.org/@@182356?ac=10

Change 182356 by gabor@gabor_aspire on 2010/08/13 13:25:17

	- Fix compilation.

Affected files ...

.. //depot/projects/soc2010/gabor_jobs/hrl_and_jobs/sys/kern/kern_jobs.c#2 edit

Differences ...

==== //depot/projects/soc2010/gabor_jobs/hrl_and_jobs/sys/kern/kern_jobs.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
 #include <sys/param.h>
 __FBSDID("$FreeBSD");
 
-#include "opt_irix_jobs.h"
+#include "opt_jobs.h"
 
 #include <sys/container.h>
 #include <sys/errno.h>
@@ -148,7 +148,7 @@
 	 */
 	jp = jobentry_alloc(uap->rjid);
 	pp = malloc(sizeof(struct procentry), M_IRIX_JOBS, M_NOWAIT | M_ZERO);
-	pp->td_proc = &td->td_proc;
+	pp->td_proc = td->td_proc;
 	LIST_INIT(&jp->proclist);
 	LIST_INSERT_HEAD(&jp->proclist, pp, entries);
 	JOBLIST_WLOCK;
@@ -178,7 +178,7 @@
 		if (jp->jid == (jid_t)uap->jid) {
 			LIST_FOREACH_SAFE(pp, &jp->proclist, entries, ptmp) {
 				struct kill_args kuap;
-#ifdef 0
+#if 0
 				printf("killjob traversed pid %d\n", pp->td_proc->p_pid);
 #endif
 				kuap.pid = pp->td_proc->p_pid;
@@ -292,19 +292,21 @@
 	return (ENOJOB);
 }
 
-#define RSUM(j, r)	struct procentry *pp;				\
+#define RSUM(j, r)	do {						\
+			struct procentry *pp;				\
 			JOBLIST_RLOCK;					\
 			LIST_FOREACH(jp, &irix_joblist, entries) {	\
 				if (jp->jid == j) {			\
 					LIST_FOREACH(pp, &jp->proclist,	\
 					    entries)			\
-						usage += pp->p_proc->	\
-						    p_container->	\
+						usage += pp->td_proc->	\
+						    p_container.	\
 						    c_resources[r];	\
 					break;				\
 				}					\
 			}						\
-			JOBLIST_RUNLOCK;
+			JOBLIST_RUNLOCK;				\
+			} while(0)
 rlim_t
 irix_jobs_getjusage(jid_t jid, int resource)
 {