PERFORCE change 100465 for review
Warner Losh
imp at FreeBSD.org
Mon Jul 3 06:34:23 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100465
Change 100465 by imp at imp_plunger on 2006/07/03 06:34:02
IFC @100463 (mostly to test to see if I got this setup right)
Affected files ...
.. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/bmtphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/exphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/inphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/qsphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/sched_4bsd.c#2 integrate
Differences ...
==== //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.562 2006/07/01 23:43:54 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.563 2006/07/02 18:22:46 alc Exp $");
/*
* Manages physical address maps.
@@ -1608,9 +1608,9 @@
vm_page_flag_clear(m, PG_WRITEABLE);
m->md.pv_list_count--;
pmap_unuse_pt(pmap, va, ptepde);
+ free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
- free_pv_entry(locked_pmap, pv);
}
}
}
==== //depot/projects/mips2/src/sys/dev/mii/acphy.c#2 (text+ko) ====
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/acphy.c,v 1.17 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/acphy.c,v 1.18 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for Altima AC101 10/100 PHY
@@ -132,7 +132,7 @@
} else
return (ENXIO);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/amphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.18 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.19 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for AMD AM79c873 PHYs
@@ -100,7 +100,7 @@
else if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxDAVICOM)
device_set_desc(dev, MII_STR_xxDAVICOM_DM9101);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/bmtphy.c#2 (text+ko) ====
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/bmtphy.c,v 1.9 2005/01/06 01:42:55 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/bmtphy.c,v 1.10 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for the Broadcom BCM5201/BCM5202 "Mini-Theta" PHYs. This also
@@ -127,7 +127,7 @@
int rval;
ma = device_get_ivars(dev);
- rval = 0;
+ rval = BUS_PROBE_DEFAULT;
if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_BROADCOM)
return (ENXIO);
@@ -135,11 +135,11 @@
switch (MII_MODEL(ma->mii_id2)) {
case MII_MODEL_BROADCOM_3C905B:
device_set_desc(dev, MII_STR_BROADCOM_3C905B);
- rval = -10; /* Let exphy take precedence. */
+ rval = BUS_PROBE_LOW_PRIORITY; /* Let exphy take precedence. */
break;
case MII_MODEL_BROADCOM_3C905C:
device_set_desc(dev, MII_STR_BROADCOM_3C905C);
- rval = -10; /* Let exphy take precedence. */
+ rval = BUS_PROBE_LOW_PRIORITY; /* Let exphy take precedence. */
break;
case MII_MODEL_BROADCOM_BCM5201:
device_set_desc(dev, MII_STR_BROADCOM_BCM5201);
==== //depot/projects/mips2/src/sys/dev/mii/brgphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.42 2006/05/16 14:36:28 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.43 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
@@ -108,73 +108,73 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5400) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5400);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5401) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5401);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5411) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5411);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5701) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5701);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5703) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5703);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5704) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5704);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5705) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5705);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5750) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5750);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5714) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5714);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5780) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5780);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5706C) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5706C);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5708C) {
device_set_desc(dev, MII_STR_xxBROADCOM_BCM5708C);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/dev/mii/ciphy.c#2 (text+ko) ====
@@ -29,11 +29,11 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/mii/ciphy.c,v 1.4 2006/05/16 14:36:28 phk Exp $
+ * $FreeBSD: src/sys/dev/mii/ciphy.c,v 1.5 2006/07/03 02:53:39 yongari Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.4 2006/05/16 14:36:28 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.5 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -100,19 +100,19 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201) {
device_set_desc(dev, MII_STR_CICADA_CS8201);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201A) {
device_set_desc(dev, MII_STR_CICADA_CS8201A);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_CICADA &&
MII_MODEL(ma->mii_id2) == MII_MODEL_CICADA_CS8201B) {
device_set_desc(dev, MII_STR_CICADA_CS8201B);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/dev/mii/e1000phy.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.15 2006/05/16 14:36:28 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.16 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for the Marvell 88E1000 series external 1000/100/10-BT PHY.
@@ -102,7 +102,7 @@
}
device_set_desc(dev, MII_STR_MARVELL_E1000);
- return 0;
+ return BUS_PROBE_DEFAULT;
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/exphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.20 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.21 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for 3Com internal PHYs
@@ -143,7 +143,7 @@
else
device_set_desc(dev, MII_STR_BROADCOM_3C905C);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/inphy.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.14 2004/05/30 17:57:40 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.15 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for Intel 82553 and 82555 PHYs
@@ -89,23 +89,23 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxINTEL &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxINTEL_I82553AB) {
device_set_desc(dev, MII_STR_xxINTEL_I82553AB);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_INTEL) {
switch (MII_MODEL(ma->mii_id2)) {
case MII_MODEL_INTEL_I82555:
device_set_desc(dev, MII_STR_INTEL_I82555);
- return (0);
+ return (BUS_PROBE_DEFAULT);
case MII_MODEL_INTEL_I82553C:
device_set_desc(dev, MII_STR_INTEL_I82553C);
- return (0);
+ return (BUS_PROBE_DEFAULT);
case MII_MODEL_INTEL_I82562EM:
device_set_desc(dev, MII_STR_INTEL_I82562EM);
- return (0);
+ return (BUS_PROBE_DEFAULT);
case MII_MODEL_INTEL_I82562ET:
device_set_desc(dev, MII_STR_INTEL_I82562ET);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
}
==== //depot/projects/mips2/src/sys/dev/mii/lxtphy.c#2 (text+ko) ====
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.15 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.16 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for Level One's LXT-970 ethernet 10/100 PHY
@@ -134,7 +134,7 @@
} else
return (ENXIO);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/mlphy.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/mlphy.c,v 1.20 2005/01/06 01:42:56 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mlphy.c,v 1.21 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for Micro Linear 6692 PHYs
@@ -127,7 +127,7 @@
device_set_desc(dev, "Micro Linear 6692 media interface");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/nsgphy.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.21 2006/05/16 14:36:28 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.22 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for the National Semiconductor DP83891 and DP83861
@@ -115,7 +115,7 @@
mpd = mii_phy_match(ma, gphyters);
if (mpd != NULL) {
device_set_desc(dev, mpd->mpd_name);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/dev/mii/nsphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.24 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.25 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for National Semiconductor's DP83840A ethernet 10/100 PHY
@@ -131,7 +131,7 @@
} else
return (ENXIO);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/pnaphy.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.16 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.17 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for homePNA PHYs
@@ -96,7 +96,7 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_AMD &&
MII_MODEL(ma->mii_id2) == MII_MODEL_AMD_79c978) {
device_set_desc(dev, MII_STR_AMD_79c978);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/dev/mii/qsphy.c#2 (text+ko) ====
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.15 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.16 2006/07/03 02:53:39 yongari Exp $");
/*
* driver for Quality Semiconductor's QS6612 ethernet 10/100 PHY
@@ -133,7 +133,7 @@
} else
return (ENXIO);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/rgephy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.9 2006/06/26 20:31:31 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.10 2006/07/03 02:53:39 yongari Exp $");
/*
* Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY.
@@ -100,7 +100,7 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxREALTEK &&
MII_MODEL(ma->mii_id2) == MII_MODEL_xxREALTEK_RTL8169S) {
device_set_desc(dev, MII_STR_xxREALTEK_RTL8169S);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/dev/mii/rlphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.22 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.23 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for RealTek 8139 internal PHYs
@@ -95,7 +95,7 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_REALTEK &&
MII_MODEL(ma->mii_id2) == MII_MODEL_REALTEK_RTL8201L) {
device_set_desc(dev, MII_STR_REALTEK_RTL8201L);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
/*
@@ -115,7 +115,7 @@
device_set_desc(dev, "RealTek internal media interface");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/ruephy.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ruephy.c,v 1.4 2004/05/30 17:57:40 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ruephy.c,v 1.5 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for RealTek RTL8150 internal PHY
@@ -104,7 +104,7 @@
device_set_desc(dev, "RealTek RTL8150 internal media interface");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/tdkphy.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/tdkphy.c,v 1.18 2006/05/16 14:36:28 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tdkphy.c,v 1.19 2006/07/03 02:53:40 yongari Exp $");
/*
* Driver for the TDK 78Q2120 MII
@@ -66,7 +66,7 @@
#if 0
#if !defined(lint)
static const char rcsid[] =
- "$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $";
+ "$Id: tdkphy.c,v 1.18 2006/05/16 14:36:28 phk Exp $";
#endif
#endif
@@ -105,7 +105,7 @@
return (ENXIO);
device_set_desc(dev, MII_STR_TDK_78Q2120);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/tlphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.19 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.20 2006/07/03 02:53:40 yongari Exp $");
/*
* Driver for Texas Instruments's ThunderLAN PHYs
@@ -140,7 +140,7 @@
device_set_desc(dev, MII_STR_xxTI_TLAN10T);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/ukphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.18 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.19 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for generic unknown PHYs
@@ -121,7 +121,7 @@
* We know something is here, so always match at a low priority.
*/
device_set_desc(dev, "Generic IEEE 802.3u media interface");
- return (-100);
+ return (BUS_PROBE_GENERIC);
}
static int
==== //depot/projects/mips2/src/sys/dev/mii/xmphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.18 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.19 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for the XaQti XMAC II's internal PHY. This is sort of
@@ -93,13 +93,13 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxXAQTI &&
MII_MODEL(ma->mii_id2) == MII_MODEL_XAQTI_XMACII) {
device_set_desc(dev, MII_STR_XAQTI_XMACII);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_JATO &&
MII_MODEL(ma->mii_id2) == MII_MODEL_JATO_BASEX) {
device_set_desc(dev, MII_STR_JATO_BASEX);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/mips2/src/sys/i386/i386/pmap.c#2 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.564 2006/06/27 04:28:23 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.565 2006/07/02 18:22:47 alc Exp $");
/*
* Manages physical address maps.
@@ -1686,9 +1686,9 @@
vm_page_flag_clear(m, PG_WRITEABLE);
m->md.pv_list_count--;
pmap_unuse_pt(pmap, va);
+ free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
- free_pv_entry(locked_pmap, pv);
}
}
sched_unpin();
==== //depot/projects/mips2/src/sys/kern/sched_4bsd.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.84 2006/06/29 19:37:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.86 2006/07/02 20:53:52 maxim Exp $");
#include "opt_hwpmc_hooks.h"
@@ -77,7 +77,7 @@
/*
* The schedulable entity that can be given a context to run.
* A process may have several of these. Probably one per processor
- * but posibly a few more. In this universe they are grouped
+ * but possibly a few more. In this universe they are grouped
* with a KSEG that contains the priority and niceness
* for the group.
*/
@@ -126,9 +126,9 @@
do { \
kg->kg_avail_opennings++; \
CTR3(KTR_RUNQ, "kg %p(%d) Slot released (->%d)", \
- kg, \
- kg->kg_concurrency, \
- kg->kg_avail_opennings); \
+ kg, \
+ kg->kg_concurrency, \
+ kg->kg_avail_opennings); \
/* KASSERT((kg->kg_avail_opennings <= kg->kg_concurrency), \
("slots out of whack"));*/ \
} while (0)
@@ -137,9 +137,9 @@
do { \
kg->kg_avail_opennings--; \
CTR3(KTR_RUNQ, "kg %p(%d) Slot used (->%d)", \
- kg, \
- kg->kg_concurrency, \
- kg->kg_avail_opennings); \
+ kg, \
+ kg->kg_concurrency, \
+ kg->kg_avail_opennings); \
/* KASSERT((kg->kg_avail_opennings >= 0), \
("slots out of whack"));*/ \
} while (0)
@@ -1399,8 +1399,6 @@
ke = td->td_kse;
return (ke->ke_pctcpu);
-
- return (0);
}
void
More information about the p4-projects
mailing list