Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Aug 2004 01:28:09 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 58966 for review
Message-ID:  <200408060128.i761S9LH092404@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=58966

Change 58966 by rwatson@rwatson_tislabs on 2004/08/06 01:27:25

	Integrate netperf_socket from FreeBSD CVS HEAD:
	
	- More ACPI tweakage.
	- New VM contigmalloc by default.

Affected files ...

.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#35 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#19 integrate
.. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_contig.c#10 integrate

Differences ...

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

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.182 2004/08/03 17:16:30 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.183 2004/08/06 00:38:50 njl Exp $
  */
 
 #include "opt_acpi.h"
@@ -1339,7 +1339,7 @@
 	ret = TRUE;
 
     /* Return true for 'present' and 'functioning' */
-    if ((devinfo->CurrentStatus & 0x9) == 0x9)
+    if (ACPI_DEVICE_PRESENT(devinfo->CurrentStatus))
 	ret = TRUE;
 
     AcpiOsFree(buf.Pointer);
@@ -1372,8 +1372,8 @@
     if ((devinfo->Valid & ACPI_VALID_STA) == 0)
 	ret = TRUE;
 
-    /* Return true for 'present' and 'functioning' */
-    if ((devinfo->CurrentStatus & 0x19) == 0x19)
+    /* Return true for 'present', 'battery present', and 'functioning' */
+    if (ACPI_BATTERY_PRESENT(devinfo->CurrentStatus))
 	ret = TRUE;
 
     AcpiOsFree(buf.Pointer);

==== //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#19 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.77 2004/07/12 20:53:04 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.78 2004/08/06 00:38:50 njl Exp $
  */
 
 #include "acpi_if.h"
@@ -222,7 +222,21 @@
 	device_printf(dev, x);					\
 } while (0)
 
-#define ACPI_DEVINFO_PRESENT(x)	(((x) & 0x9) == 9)
+/* Values for the device _STA (status) method. */
+#define ACPI_STA_PRESENT	(1 << 0)
+#define ACPI_STA_ENABLED	(1 << 1)
+#define ACPI_STA_SHOW_IN_UI	(1 << 2)
+#define ACPI_STA_FUNCTIONAL	(1 << 3)
+#define ACPI_STA_BATT_PRESENT	(1 << 4)
+
+#define ACPI_DEVINFO_PRESENT(x, flags)					\
+	(((x) & (flags)) == (flags))
+#define ACPI_DEVICE_PRESENT(x)						\
+	ACPI_DEVINFO_PRESENT(x, ACPI_STA_PRESENT | ACPI_STA_FUNCTIONAL)
+#define ACPI_BATTERY_PRESENT(x)						\
+	ACPI_DEVINFO_PRESENT(x, ACPI_STA_PRESENT | ACPI_STA_FUNCTIONAL | \
+	    ACPI_STA_BATT_PRESENT)
+
 BOOLEAN		acpi_DeviceIsPresent(device_t dev);
 BOOLEAN		acpi_BatteryIsPresent(device_t dev);
 ACPI_STATUS	acpi_GetHandleInScope(ACPI_HANDLE parent, char *path,

==== //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#12 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.426 2004/08/02 02:07:56 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.427 2004/08/05 23:54:04 des Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
@@ -2764,7 +2764,7 @@
 #endif
 
 #ifdef DEV_SPLASH
-	if (!(sc->flags & SC_SPLASH_SCRN) && (flags & SC_KERNEL_CONSOLE)) {
+	if (!(sc->flags & SC_SPLASH_SCRN)) {
 	    /* we are ready to put up the splash image! */
 	    splash_init(sc->adp, scsplash_callback, sc);
 	    sc->flags |= SC_SPLASH_SCRN;

==== //depot/projects/netperf_socket/sys/vm/vm_contig.c#10 (text+ko) ====

@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.37 2004/07/19 23:29:36 green Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.38 2004/08/05 21:54:11 green Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -515,7 +515,7 @@
 	return ((void *)addr);
 }
 
-static int vm_old_contigmalloc = 1;
+static int vm_old_contigmalloc = 0;
 SYSCTL_INT(_vm, OID_AUTO, old_contigmalloc,
     CTLFLAG_RW, &vm_old_contigmalloc, 0, "Use the old contigmalloc algorithm");
 TUNABLE_INT("vm.old_contigmalloc", &vm_old_contigmalloc);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408060128.i761S9LH092404>