PERFORCE change 54947 for review

[Robert Watson]

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

Change 54947 by rwatson at rwatson_tislabs on 2004/06/14 20:26:34

	Integrate netperf_socket.

Affected files ...

.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#19 integrate
.. //depot/projects/netperf_socket/sys/sys/gmon.h#4 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.15 2004/05/28 17:31:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.16 2004/06/14 18:54:14 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -48,6 +48,7 @@
 	TAILQ_ENTRY(acpi_pci_link_entry) links;
 	ACPI_HANDLE	handle;
 	UINT8		current_irq;
+	UINT8		initial_irq;
 	ACPI_RESOURCE	possible_resources;
 	UINT8		number_of_interrupts;
 	UINT8		interrupts[MAX_POSSIBLE_INTERRUPTS];
@@ -72,9 +73,6 @@
 
 static int	irq_penalty[MAX_ACPI_INTERRUPTS];
 
-static int	acpi_pci_link_is_valid_irq(struct acpi_pci_link_entry *link,
-    UINT8 irq);
-
 #define ACPI_STA_PRESENT	0x00000001
 #define ACPI_STA_ENABLE		0x00000002
 #define ACPI_STA_SHOWINUI	0x00000004
@@ -384,12 +382,7 @@
 		    acpi_name(handle), AcpiFormatException(error)));
 	}
 
-	if (!acpi_pci_link_is_valid_irq(link, link->current_irq)) {
-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-		    "initial IRQ %u is invalid for link %s\n",
-		    link->current_irq, acpi_name(handle)));
-		link->current_irq = 0;
-	}
+	link->initial_irq = link->current_irq;
 
 	error = AcpiGetPossibleResources(handle, &buf);
 	if (ACPI_FAILURE(error)) {
@@ -532,6 +525,11 @@
 		if (link->interrupts[i] == irq)
 			return (1);
 	}
+
+	/* allow initial IRQ as valid one. */
+	if (link->initial_irq == irq)
+		return (1);
+
 	return (0);
 }
 

==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#19 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1160 2004/05/17 14:42:59 rik Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1161 2004/06/14 18:37:23 jhb Exp $
 #
 
 #
@@ -44,7 +44,7 @@
 # they are enabled.  However, most HTT systems do not list HTT CPUs
 # in the MP Table if they are enabled, thus we guess at the HTT CPUs
 # for the MP Table case.  However, we shouldn't try to guess and use
-# these CPUs if HTTT is disabled.  Thus, HTT guessing is only enabled
+# these CPUs if HTT is disabled.  Thus, HTT guessing is only enabled
 # for the MP Table if the user explicitly asks for it via the
 # MPTABLE_FORCE_HTT option.  Do NOT use this option if you have HTT
 # disabled in your BIOS.
@@ -1014,7 +1014,7 @@
 # VM OPTIONS
 
 # Disable the 4 MByte page PSE CPU feature.  The PSE feature allows the
-# kernel to use a 4 MByte pages to map the kernel instead of 4k pages.
+# kernel to use 4 MByte pages to map the kernel instead of 4k pages.
 # This saves on the amount of memory needed for page tables needed to
 # map the kernel.  You should only disable this feature as a temporary
 # workaround if you are having problems with it enabled.

==== //depot/projects/netperf_socket/sys/sys/gmon.h#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sys/gmon.h,v 1.18 2004/05/19 15:41:26 bde Exp $
+ * $FreeBSD: src/sys/sys/gmon.h,v 1.19 2004/06/14 18:39:28 bms Exp $
  */
 
 #ifndef _SYS_GMON_H_
@@ -228,6 +228,15 @@
 void	nullfunc(void);
 void	nullfunc_loop(void);
 
+#else /* !_KERNEL */
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+void	moncontrol(int);
+void	monstartup(u_long, u_long);
+__END_DECLS
+
 #endif /* _KERNEL */
 
 #endif /* !_SYS_GMON_H_ */