PERFORCE change 83419 for review
Robert Watson
rwatson at FreeBSD.org
Sun Sep 11 14:16:22 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=83419
Change 83419 by rwatson at rwatson_zoo on 2005/09/11 21:16:01
Integer netsmp branch from FreeBSD CVS HEAD.
- Much include path cleanup, some popular.
Affected files ...
.. //depot/projects/netsmp/src/sys/alpha/include/param.h#2 integrate
.. //depot/projects/netsmp/src/sys/alpha/include/vmparam.h#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/nve/amd64/nvenetlib.README#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/nve/i386/nvenetlib.README#1 branch
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_sony.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_toshiba.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdMemory.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdStream.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdTable.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_if.m#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_isab.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_lid.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_package.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_perf.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_powerres.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_quirk.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_thermal.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_throttle.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/fdc/fdc_acpi.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/neomagic.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs.h#2 integrate
.. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/acpica/madt.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/include/param.h#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/zlib.c#2 integrate
.. //depot/projects/netsmp/src/sys/netatalk/at_proto.c#2 integrate
Differences ...
==== //depot/projects/netsmp/src/sys/alpha/include/param.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.38 2005/01/05 20:05:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.39 2005/09/11 20:51:14 alc Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*-
@@ -106,13 +106,6 @@
#define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */
#define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)
-#define CLSIZE 1
-#define CLSIZELOG2 0
-
-/* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */
-#define SSIZE 1 /* initial stack size/NBPG */
-#define SINCR 1 /* increment of stack/NBPG */
-
#ifndef KSTACK_PAGES
#define KSTACK_PAGES 2 /* pages of kstack (with pcb) */
#endif
==== //depot/projects/netsmp/src/sys/alpha/include/vmparam.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.10 2005/01/05 20:05:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.11 2005/09/11 20:51:14 alc Exp $ */
/* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
#ifndef _ALPHA_VMPARAM_H
#define _ALPHA_VMPARAM_H
@@ -118,7 +118,7 @@
* by the page replacement algorithm. Basically this says that if you are
* swapped in you deserve some resources. We protect the last SAFERSS
* pages against paging and will just swap you out rather than paging you.
- * Note that each process has at least UPAGES+CLSIZE pages which are not
+ * Note that each process has at least UPAGES pages which are not
* paged anyways, in addition to SAFERSS.
*/
#define SAFERSS 10 /* nominal ``small'' resident set size
==== //depot/projects/netsmp/src/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $");
/*
* 6.1 : Environmental support
@@ -35,7 +35,7 @@
#include <sys/linker_set.h>
#include <sys/sysctl.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
static u_long amd64_acpi_root;
==== //depot/projects/netsmp/src/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ====
@@ -25,12 +25,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
static int intr_model = ACPI_INTR_PIC;
==== //depot/projects/netsmp/src/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ====
@@ -26,12 +26,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.21 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
int
==== //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16 2005/04/15 18:44:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.17 2005/09/11 18:39:00 obrien Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/md_var.h>
#include <machine/specialreg.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/actables.h>
#include <dev/acpica/acpivar.h>
#include <dev/pci/pcivar.h>
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_asus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.24 2005/05/09 12:51:48 philip Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.25 2005/09/11 18:39:00 obrien Exp $");
/*
* Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -47,7 +47,7 @@
#include <sys/bus.h>
#include <sys/sbuf.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/led/led.h>
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_fujitsu.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.2 2005/04/04 10:21:20 philip Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.3 2005/09/11 18:39:00 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -37,7 +37,7 @@
#include <sys/module.h>
#include <sys/sysctl.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_ibm.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.8 2005/08/04 22:48:36 markus Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.9 2005/09/11 18:39:00 obrien Exp $");
/*
* Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops.
@@ -42,7 +42,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <machine/cpufunc.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include "acpi_if.h"
#include <sys/module.h>
#include <dev/acpica/acpivar.h>
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_panasonic.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.8 2005/05/14 10:51:16 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.9 2005/09/11 18:39:00 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -37,7 +37,7 @@
#include <sys/bus.h>
#include <sys/power.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OEM
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_sony.c#2 (text+ko) ====
@@ -25,13 +25,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.8 2005/03/02 09:22:34 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.9 2005/09/11 18:39:00 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include "acpi_if.h"
#include <sys/module.h>
#include <dev/acpica/acpivar.h>
==== //depot/projects/netsmp/src/sys/dev/acpi_support/acpi_toshiba.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.16 2005/03/24 19:02:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.17 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -34,7 +34,7 @@
#include <sys/module.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OEM
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdDebug.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.10 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.11 2005/09/11 18:39:02 obrien Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
@@ -41,8 +41,8 @@
#include <ddb/ddb.h>
#include <ddb/db_output.h>
-#include "acpi.h"
-#include "acdebug.h"
+#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/acdebug.h>
#include <dev/acpica/acpivar.h>
UINT32
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdHardware.c#3 (text+ko) ====
@@ -30,9 +30,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.16 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.17 2005/09/11 18:39:02 obrien Exp $");
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <machine/bus.h>
#include <machine/pci_cfgreg.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdInterrupt.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.20 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.21 2005/09/11 18:39:02 obrien Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -39,7 +39,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OS_SERVICES
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdMemory.c#3 (text+ko) ====
@@ -31,9 +31,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.12 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.13 2005/09/11 18:39:02 obrien Exp $");
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSchedule.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.33 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.34 2005/09/11 18:39:02 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -44,7 +44,7 @@
#include <sys/taskqueue.h>
#include <machine/clock.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OS_SERVICES
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdStream.c#3 (text+ko) ====
@@ -30,9 +30,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.5 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.6 2005/09/11 18:39:02 obrien Exp $");
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
void
AcpiOsPrintf(const char *Format, ...)
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSynch.c#3 (text+ko) ====
@@ -30,9 +30,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.23 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.24 2005/09/11 18:39:02 obrien Exp $");
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include "opt_acpi.h"
#include <sys/kernel.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdTable.c#3 (text+ko) ====
@@ -29,14 +29,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.9 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.10 2005/09/11 18:39:02 obrien Exp $");
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/kernel.h>
#include <sys/linker.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/actables.h>
#undef _COMPONENT
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214 2005/06/03 20:12:12 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.215 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -55,7 +55,7 @@
#include <isa/isavar.h>
#include <isa/pnpvar.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpiio.h>
#include <contrib/dev/acpica/acnamesp.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_acad.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.34 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.35 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/conf.h>
#include <sys/power.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpiio.h>
#include <isa/isavar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.18 2005/08/11 17:12:57 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.19 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -36,7 +36,7 @@
#include <sys/ioccom.h>
#include <sys/sysctl.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpiio.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_button.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.30 2005/03/02 09:22:34 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.31 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -35,7 +35,7 @@
#include <sys/module.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.40 2005/07/23 19:35:59 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.41 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -41,7 +41,7 @@
#include <sys/rman.h>
#include <sys/malloc.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpiio.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57 2005/04/10 19:21:42 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.58 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -46,7 +46,7 @@
#include <machine/bus.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/*
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_ec.c#2 (text+ko) ====
@@ -136,7 +136,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.65 2005/05/12 22:35:08 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.66 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -150,7 +150,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_if.m#3 (text+ko) ====
@@ -23,12 +23,12 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.7 2005/07/23 19:35:59 njl Exp $
+# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.8 2005/09/11 18:39:01 obrien Exp $
#
#include <sys/bus.h>
#include <sys/types.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
INTERFACE acpi;
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_isab.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.9 2004/06/29 19:02:27 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.10 2005/09/11 18:39:01 obrien Exp $");
/*
* ISA Bridge driver for Generic ISA Bus Devices. See section 10.7 of the
@@ -39,7 +39,7 @@
#include <sys/malloc.h>
#include <sys/module.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <isa/isavar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_lid.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.27 2004/08/25 20:09:15 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.28 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -37,7 +37,7 @@
#include <sys/bus.h>
#include <sys/proc.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_package.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.7 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.8 2005/09/11 18:39:01 obrien Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -36,7 +36,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/*
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.26 2005/01/06 01:42:24 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.27 2005/09/11 18:39:01 obrien Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/malloc.h>
#include <sys/module.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <sys/pciio.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.45 2005/07/27 15:21:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.46 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -35,7 +35,7 @@
#include <sys/malloc.h>
#include <sys/module.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpi_pcibvar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.56 2005/03/08 17:22:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.57 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -34,7 +34,7 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpi_pcibvar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.47 2005/03/02 09:22:34 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.48 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -36,7 +36,7 @@
#include <sys/module.h>
#include <sys/sysctl.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <machine/pci_cfgreg.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib_pci.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.12 2004/12/27 05:36:47 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.13 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
@@ -36,7 +36,7 @@
#include <sys/malloc.h>
#include <sys/module.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/acpica/acpi_pcibvar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_perf.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.21 2005/05/29 04:42:16 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.22 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -44,7 +44,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include "cpufreq_if.h"
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_powerres.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.28 2004/12/27 05:36:47 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.29 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -33,7 +33,7 @@
#include <sys/malloc.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/*
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_quirk.c#3 (text+ko) ====
@@ -25,12 +25,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.2 2005/07/22 23:10:02 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.3 2005/09/11 18:39:01 obrien Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
enum ops_t {
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_resource.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.34 2005/03/18 11:57:44 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.35 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_thermal.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.59 2005/08/26 02:21:02 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.60 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -45,7 +45,7 @@
#include "cpufreq_if.h"
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* Hooks for the ACPI CA debugging infrastructure */
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_throttle.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.7 2005/04/10 20:04:30 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.8 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <machine/bus.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/pci/pcivar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_timer.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.38 2005/03/02 09:22:34 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.39 2005/09/11 18:39:01 obrien Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <machine/resource.h>
#include <sys/rman.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/pci/pcivar.h>
==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_video.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.10 2005/03/02 09:22:34 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.11 2005/09/11 18:39:01 obrien Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -38,7 +38,7 @@
#include <sys/queue.h>
#include <sys/sysctl.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
/* ACPI video extension driver. */
==== //depot/projects/netsmp/src/sys/dev/fdc/fdc_acpi.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.10 2004/09/29 19:08:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.11 2005/09/11 18:39:02 obrien Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -35,7 +35,7 @@
#include <sys/module.h>
#include <sys/proc.h>
-#include "acpi.h"
+#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
#include <dev/fdc/fdcvar.h>
==== //depot/projects/netsmp/src/sys/dev/mpt/mpt_pci.c#3 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.21 2005/08/03 14:08:41 gibbs Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.22 2005/09/11 19:58:19 mjacob Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h>
@@ -97,6 +97,10 @@
#define PCI_PRODUCT_LSI_FC929 0x0622
#endif
+#ifndef PCI_PRODUCT_LSI_FC929X
+#define PCI_PRODUCT_LSI_FC929X 0x0626
+#endif
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list