PERFORCE change 60330 for review

[Peter Wemm]

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

Change 60330 by peter at peter_daintree on 2004/08/23 22:56:23

	integ -I -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#68 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#28 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#101 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#43 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#12 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#68 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#28 (text+ko) ====

@@ -97,6 +97,7 @@
 			     void (*)(void *), void *, void **);
 static	int nexus_teardown_intr(device_t, device_t, struct resource *,
 				void *);
+static struct resource_list *nexus_get_reslist(device_t dev, device_t child);
 static	int nexus_set_resource(device_t, device_t, int, int, u_long, u_long);
 static	int nexus_get_resource(device_t, device_t, int, int, u_long *, u_long *);
 static void nexus_delete_resource(device_t, device_t, int, int);
@@ -120,6 +121,7 @@
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
 	DEVMETHOD(bus_config_intr,	nexus_config_intr),
+	DEVMETHOD(bus_get_resource_list, nexus_get_reslist),
 	DEVMETHOD(bus_set_resource,	nexus_set_resource),
 	DEVMETHOD(bus_get_resource,	nexus_get_resource),
 	DEVMETHOD(bus_delete_resource,	nexus_delete_resource),
@@ -464,6 +466,14 @@
 	return (intr_config_intr(irq, trig, pol));
 }
 
+static struct resource_list *
+nexus_get_reslist(device_t dev, device_t child)
+{
+	struct nexus_device *ndev = DEVTONX(child);
+
+	return (&ndev->nx_resources);
+}
+
 static int
 nexus_set_resource(device_t dev, device_t child, int type, int rid, u_long start, u_long count)
 {

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#101 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/NOTES#43 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1168)
+# (XXX from i386:NOTES,v 1.1170)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $
 #