From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 22:40:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75E1516A4D0; Thu, 29 Jul 2004 22:40:56 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3816816A4CE
	for <perforce@freebsd.org>; Thu, 29 Jul 2004 22:40:56 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1953243D1F
	for <perforce@freebsd.org>; Thu, 29 Jul 2004 22:40:56 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6TMetvp058743
	for <perforce@freebsd.org>; Thu, 29 Jul 2004 22:40:55 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6TMetWQ058740
	for perforce@freebsd.org; Thu, 29 Jul 2004 22:40:55 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 29 Jul 2004 22:40:55 GMT
Message-Id: <200407292240.i6TMetWQ058740@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 58502 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 29 Jul 2004 22:40:57 -0000

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

Change 58502 by jhb@jhb_blue on 2004/07/29 22:40:40

	Fix compile with evil nested include.  Fixing all consumers of
	machine/cpufunc.h isn't very feasible since sys/system.h includes
	it directly.

Affected files ...

.. //depot/projects/smpng/sys/i386/include/cpufunc.h#29 edit

Differences ...

==== //depot/projects/smpng/sys/i386/include/cpufunc.h#29 (text+ko) ====

@@ -38,6 +38,8 @@
 #ifndef _MACHINE_CPUFUNC_H_
 #define	_MACHINE_CPUFUNC_H_
 
+#include <machine/psl.h>
+
 struct region_descriptor;
 
 #define readb(va)	(*(volatile u_int8_t *) (va))