From owner-p4-projects@FreeBSD.ORG Sun Dec 17 02:18:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9986E16A416; Sun, 17 Dec 2006 02:18:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 55F2616A40F for ; Sun, 17 Dec 2006 02:18:16 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24DEF43C9F for ; Sun, 17 Dec 2006 02:18:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBH2IGTf066204 for ; Sun, 17 Dec 2006 02:18:16 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBH2IFu3066201 for perforce@freebsd.org; Sun, 17 Dec 2006 02:18:15 GMT (envelope-from marcel@freebsd.org) Date: Sun, 17 Dec 2006 02:18:15 GMT Message-Id: <200612170218.kBH2IFu3066201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2006 02:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111830 Change 111830 by marcel@marcel_nfs on 2006/12/17 02:17:28 The cpu nodes are under the cpus node, not the root node. Affected files ... .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#6 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#6 (text+ko) ==== @@ -51,12 +51,18 @@ * device tree. */ root = OF_peer(0); - for (dev = OF_child(root); dev != 0; dev = OF_peer(dev)) { - res = OF_getprop(dev, "device_type", buf, sizeof(buf)); - if (res < 0) + dev = OF_child(root); + while (dev != 0) { + res = OF_getprop(dev, "name", buf, sizeof(buf)); + if (res < 0 || strcmp(buf, "cpus") != 0) { + dev = OF_peer(dev); continue; - if (strcmp(buf, "cpu") == 0) - mp_ncpus++; + } + for (dev = OF_child(dev); dev != 0; dev = OF_peer(dev)) { + res = OF_getprop(dev, "device_type", buf, sizeof(buf)); + if (res > 0 && strcmp(buf, "cpu") == 0) + mp_ncpus++; + } } /* Sanity. */ if (mp_ncpus == 0) From owner-p4-projects@FreeBSD.ORG Sun Dec 17 04:43:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AC6B16A415; Sun, 17 Dec 2006 04:43:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7DBD16A403 for ; Sun, 17 Dec 2006 04:43:21 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6137743CAA for ; Sun, 17 Dec 2006 04:43:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBH4hLiF095322 for ; Sun, 17 Dec 2006 04:43:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBH4hL2v095319 for perforce@freebsd.org; Sun, 17 Dec 2006 04:43:21 GMT (envelope-from marcel@freebsd.org) Date: Sun, 17 Dec 2006 04:43:21 GMT Message-Id: <200612170443.kBH4hL2v095319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2006 04:43:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=111833 Change 111833 by marcel@marcel_cluster on 2006/12/17 04:42:31 Add the beginnings of what may turn into HFS Plus support. Affected files ... .. //depot/projects/powerpc/sys/sys/hfsplus.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 17 17:04:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFB9316A412; Sun, 17 Dec 2006 17:04:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96FAD16A407 for ; Sun, 17 Dec 2006 17:04:45 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4553843CA5 for ; Sun, 17 Dec 2006 17:04:45 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBHH4jU9077450 for ; Sun, 17 Dec 2006 17:04:45 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBHH4j2j077447 for perforce@freebsd.org; Sun, 17 Dec 2006 17:04:45 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 17 Dec 2006 17:04:45 GMT Message-Id: <200612171704.kBHH4j2j077447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2006 17:04:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=111846 Change 111846 by mjacob@mjexp on 2006/12/17 17:04:23 Integrate a few useful changes. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#5 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.133 2006/12/05 07:50:23 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.135 2006/12/17 16:59:18 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -524,6 +524,7 @@ } } if (val & BIU2400_DMA_ACTIVE) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "DMA Failed to Stop on Reset"); return; } @@ -544,6 +545,7 @@ } } if (val & BIU2400_SOFT_RESET) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "Failed to come out of reset"); return; } @@ -585,6 +587,7 @@ USEC_DELAY(100); if (--loops < 0) { ISP_DUMPREGS(isp, "chip reset timed out"); + ISP_RESET0(isp); return; } } @@ -626,6 +629,7 @@ } } if (val != 0) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "reset didn't clear"); return; } @@ -691,6 +695,7 @@ while (ISP_READ(isp, OUTMAILBOX0) == MBOX_BUSY) { USEC_DELAY(100); if (--loops < 0) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "MBOX_BUSY never cleared on reset"); return; @@ -712,6 +717,7 @@ mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } @@ -728,11 +734,13 @@ mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } if (mbs.param[1] != 0xdead || mbs.param[2] != 0xbeef || mbs.param[3] != 0xffff || mbs.param[4] != 0x1111 || mbs.param[5] != 0xa5a5) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "Register Test Failed (0x%x 0x%x 0x%x 0x%x 0x%x)", mbs.param[1], mbs.param[2], mbs.param[3], @@ -820,6 +828,7 @@ if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W Risc Ram Load Failed"); + ISP_RESET0(isp); return; } la += nw; @@ -881,6 +890,7 @@ if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W Risc Ram Load Failed"); + ISP_RESET0(isp); return; } la += nw; @@ -897,6 +907,7 @@ isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, dcrc); + ISP_RESET0(isp); return; } break; @@ -935,6 +946,7 @@ isp_prt(isp, ISP_LOGERR, "F/W download failed at word %d", isp->isp_mbxwrk1 - code_org); + ISP_RESET0(isp); return; } /* @@ -947,6 +959,7 @@ isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, dcrc); + ISP_RESET0(isp); return; } isp->isp_loaded_fw = 1; @@ -989,6 +1002,7 @@ isp_mboxcmd(isp, &mbs); if (IS_2322(isp) || IS_24XX(isp)) { if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } } @@ -1016,11 +1030,13 @@ mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } if (IS_24XX(isp) && mbs.param[1] == 0xdead) { isp_prt(isp, ISP_LOGERR, "f/w didn't *really* start"); + ISP_RESET0(isp); return; } @@ -1107,6 +1123,7 @@ mbs.logval = MBLOGALL; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } if (isp->isp_maxcmds >= mbs.param[2]) { @@ -6352,7 +6369,7 @@ ISPOPMAP(0xff, 0xff), /* 0x06: MBOX_MAILBOX_REG_TEST */ ISPOPMAP(0x03, 0x07), /* 0x07: MBOX_VERIFY_CHECKSUM */ ISPOPMAP(0x01, 0x4f), /* 0x08: MBOX_ABOUT_FIRMWARE */ - ISPOPMAP(0xdf, 0x01), /* 0x09: LOAD RAM */ + ISPOPMAP(0xdf, 0x01), /* 0x09: MBOX_LOAD_RISC_RAM_2100 */ ISPOPMAP(0xdf, 0x01), /* 0x0a: DUMP RAM */ ISPOPMAP(0x1ff, 0x01), /* 0x0b: MBOX_LOAD_RISC_RAM */ ISPOPMAP(0x00, 0x00), /* 0x0c: */ ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.130 2006/12/09 01:30:05 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.131 2006/12/17 16:59:18 mjacob Exp $"); #include #include #include @@ -3458,42 +3458,52 @@ void isp_mbox_wait_complete(ispsoftc_t *isp, mbreg_t *mbp) { - int usecs = mbp->timeout; - int j; + unsigned int usecs = mbp->timeout; + unsigned int max, olim, ilim; if (usecs == 0) { usecs = MBCMD_DEFAULT_TIMEOUT; } - if (isp->isp_mbxwrk0) { - usecs *= isp->isp_mbxwrk0; - } + max = isp->isp_mbxwrk0 + 1; + if (isp->isp_osinfo.mbox_sleep_ok) { - int ms = usecs / 1000; + unsigned int ms = (usecs + 999) / 1000; + isp->isp_osinfo.mbox_sleep_ok = 0; isp->isp_osinfo.mbox_sleeping = 1; + for (olim = 0; olim < max; olim++) { #if __FreeBSD_version < 500000 || !defined(ISP_SMPLOCK) - tsleep(&isp->isp_mbxworkp, PRIBIO, "ispmbx_sleep", - isp_mstohz(ms)); + tsleep(&isp->isp_mbxworkp, PRIBIO, "ispmbx_sleep", + isp_mstohz(ms)); #else - msleep(&isp->isp_mbxworkp, &isp->isp_mtx, PRIBIO, - "ispmbx_sleep", isp_mstohz(ms)); + msleep(&isp->isp_mbxworkp, &isp->isp_mtx, PRIBIO, + "ispmbx_sleep", isp_mstohz(ms)); #endif + if (isp->isp_osinfo.mboxcmd_done) { + break; + } + } isp->isp_osinfo.mbox_sleep_ok = 1; isp->isp_osinfo.mbox_sleeping = 0; } else { - for (j = 0; j < usecs; j += 100) { - uint32_t isr; - uint16_t sema, mbox; - if (isp->isp_osinfo.mboxcmd_done) { - break; - } - if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { - isp_intr(isp, isr, sema, mbox); + for (olim = 0; olim < max; olim++) { + for (ilim = 0; ilim < usecs; ilim += 100) { + uint32_t isr; + uint16_t sema, mbox; if (isp->isp_osinfo.mboxcmd_done) { break; } + if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { + isp_intr(isp, isr, sema, mbox); + if (isp->isp_osinfo.mboxcmd_done) { + break; + } + } + USEC_DELAY(100); } - USEC_DELAY(100); + if (isp->isp_osinfo.mboxcmd_done) { + break; + } } } if (isp->isp_osinfo.mboxcmd_done == 0) { @@ -3524,12 +3534,16 @@ int isp_mstohz(int ms) { + int hz; struct timeval t; t.tv_sec = ms / 1000; t.tv_usec = (ms % 1000) * 1000; - ms = tvtohz(&t); - if (ms < 0) { - ms = 0x7fffffff; + hz = tvtohz(&t); + if (hz < 0) { + hz = 0x7fffffff; + } + if (hz == 0) { + hz = 1; } - return (ms); + return (hz); } ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.128 2006/12/10 03:41:48 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.129 2006/12/16 05:54:29 mjacob Exp $"); #include #include @@ -81,6 +81,7 @@ isp_pci_dmateardown(ispsoftc_t *, XS_T *, uint32_t); +static void isp_pci_reset0(ispsoftc_t *); static void isp_pci_reset1(ispsoftc_t *); static void isp_pci_dumpregs(ispsoftc_t *, const char *); @@ -91,7 +92,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs, NULL, @@ -105,7 +106,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs, NULL, @@ -119,7 +120,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs, NULL, @@ -133,7 +134,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs }; @@ -145,7 +146,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs }; @@ -157,7 +158,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, isp_pci_dumpregs }; @@ -169,7 +170,7 @@ isp_pci_mbxdma, isp_pci_dmasetup, isp_pci_dmateardown, - NULL, + isp_pci_reset0, isp_pci_reset1, NULL }; @@ -2882,6 +2883,12 @@ static void +isp_pci_reset0(ispsoftc_t *isp) +{ + ISP_DISABLE_INTS(isp); +} + +static void isp_pci_reset1(ispsoftc_t *isp) { if (!IS_24XX(isp)) { ==== //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.24 2006/12/10 03:41:48 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.25 2006/12/16 05:54:29 mjacob Exp $"); #include #include @@ -63,6 +63,7 @@ static void isp_sbus_dmateardown(ispsoftc_t *, XS_T *, uint32_t); +static void isp_sbus_reset0(ispsoftc_t *); static void isp_sbus_reset1(ispsoftc_t *); static void isp_sbus_dumpregs(ispsoftc_t *, const char *); @@ -73,7 +74,7 @@ isp_sbus_mbxdma, isp_sbus_dmasetup, isp_sbus_dmateardown, - NULL, + isp_sbus_reset0, isp_sbus_reset1, isp_sbus_dumpregs, NULL, @@ -826,6 +827,12 @@ } static void +isp_sbus_reset0(ispsoftc_t *isp) +{ + ISP_DISABLE_INTS(isp); +} + +static void isp_sbus_reset1(ispsoftc_t *isp) { ISP_ENABLE_INTS(isp); ==== //depot/projects/mjexp/sys/dev/isp/ispmbox.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.56 2006/12/09 01:33:55 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.57 2006/12/17 16:59:19 mjacob Exp $ */ /*- * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters. * @@ -42,7 +42,7 @@ #define MBOX_MAILBOX_REG_TEST 0x0006 #define MBOX_VERIFY_CHECKSUM 0x0007 #define MBOX_ABOUT_FIRMWARE 0x0008 - /* 9 */ +#define MBOX_LOAD_RISC_RAM_2100 0x0009 /* a */ #define MBOX_LOAD_RISC_RAM 0x000b /* c */ ==== //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#5 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.46 2006/12/10 01:13:56 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.47 2006/12/16 07:39:55 mjacob Exp $"); #include #include @@ -110,6 +110,12 @@ #include #include +#if __FreeBSD_version >= 700000 +#ifndef CAM_NEW_TRAN_CODE +#define CAM_NEW_TRAN_CODE 1 +#endif +#endif + static void mpt_poll(struct cam_sim *); static timeout_t mpt_timeout; static void mpt_action(struct cam_sim *, union ccb *); @@ -2951,7 +2957,11 @@ break; } +#ifdef CAM_NEW_TRAN_CODE #define IS_CURRENT_SETTINGS(c) ((c)->type == CTS_TYPE_CURRENT_SETTINGS) +#else +#define IS_CURRENT_SETTINGS(c) ((c)->flags & CCB_TRANS_CURRENT_SETTINGS) +#endif #define DP_DISC_ENABLE 0x1 #define DP_DISC_DISABL 0x2 #define DP_DISC (DP_DISC_ENABLE|DP_DISC_DISABL) @@ -2968,8 +2978,10 @@ case XPT_SET_TRAN_SETTINGS: /* Nexus Settings */ { +#ifdef CAM_NEW_TRAN_CODE struct ccb_trans_settings_scsi *scsi; struct ccb_trans_settings_spi *spi; +#endif uint8_t dval; u_int period; u_int offset; @@ -2982,6 +2994,7 @@ break; } +#ifdef CAM_NEW_TRAN_CODE scsi = &cts->proto_specific.scsi; spi = &cts->xport_specific.spi; @@ -2992,6 +3005,7 @@ mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } +#endif /* * Skip attempting settings on RAID volume disks. @@ -3021,6 +3035,28 @@ period = 0; offset = 0; +#ifndef CAM_NEW_TRAN_CODE + if ((cts->valid & CCB_TRANS_DISC_VALID) != 0) { + dval |= (cts->flags & CCB_TRANS_DISC_ENB) ? + DP_DISC_ENABLE : DP_DISC_DISABL; + } + + if ((cts->valid & CCB_TRANS_TQ_VALID) != 0) { + dval |= (cts->flags & CCB_TRANS_TAG_ENB) ? + DP_TQING_ENABLE : DP_TQING_DISABL; + } + + if ((cts->valid & CCB_TRANS_BUS_WIDTH_VALID) != 0) { + dval |= cts->bus_width ? DP_WIDE : DP_NARROW; + } + + if ((cts->valid & CCB_TRANS_SYNC_RATE_VALID) && + (cts->valid & CCB_TRANS_SYNC_OFFSET_VALID)) { + dval |= DP_SYNC; + period = cts->sync_period; + offset = cts->sync_offset; + } +#else if ((spi->valid & CTS_SPI_VALID_DISC) != 0) { dval |= ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) ? DP_DISC_ENABLE : DP_DISC_DISABL; @@ -3056,6 +3092,7 @@ period &= MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK; period >>= MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD; } +#endif CAMLOCK_2_MPTLOCK(mpt); if (dval & DP_DISC_ENABLE) { mpt->mpt_disc_enable |= (1 << tgt); @@ -3091,8 +3128,10 @@ } case XPT_GET_TRAN_SETTINGS: { +#ifdef CAM_NEW_TRAN_CODE + struct ccb_trans_settings_scsi *scsi; cts = &ccb->cts; - struct ccb_trans_settings_scsi *scsi; + cts->protocol = PROTO_SCSI; if (mpt->is_fc) { struct ccb_trans_settings_fc *fc = &cts->xport_specific.fc; @@ -3104,24 +3143,38 @@ } else if (mpt->is_sas) { struct ccb_trans_settings_sas *sas = &cts->xport_specific.sas; - cts->protocol_version = SCSI_REV_SPC2; cts->transport = XPORT_SAS; cts->transport_version = 0; sas->valid = CTS_SAS_VALID_SPEED; sas->bitrate = 300000; } else { + cts->protocol_version = SCSI_REV_2; + cts->transport = XPORT_SPI; + cts->transport_version = 2; if (mpt_get_spi_settings(mpt, cts) != 0) { mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); - } else { - mpt_set_ccb_status(ccb, CAM_REQ_CMP); + break; } - break; } - cts->protocol = PROTO_SCSI; scsi = &cts->proto_specific.scsi; scsi->valid = CTS_SCSI_VALID_TQ; scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; +#else + cts = &ccb->cts; + if (mpt->is_fc) { + cts->flags = CCB_TRANS_TAG_ENB | CCB_TRANS_DISC_ENB; + cts->valid = CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID; + cts->bus_width = MSG_EXT_WDTR_BUS_8_BIT; + } else if (mpt->is_sas) { + cts->flags = CCB_TRANS_TAG_ENB | CCB_TRANS_DISC_ENB; + cts->valid = CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID; + cts->bus_width = MSG_EXT_WDTR_BUS_8_BIT; + } else if (mpt_get_spi_settings(mpt, cts) != 0) { + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + break; + } +#endif mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } @@ -3296,18 +3349,15 @@ static int mpt_get_spi_settings(struct mpt_softc *mpt, struct ccb_trans_settings *cts) { +#ifdef CAM_NEW_TRAN_CODE struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; +#endif target_id_t tgt; uint32_t dval, pval, oval; int rv; - cts->protocol = PROTO_SCSI; - cts->protocol_version = SCSI_REV_2; - cts->transport = XPORT_SPI; - cts->transport_version = 2; - - if (cts->type == CTS_TYPE_USER_SETTINGS) { + if (IS_CURRENT_SETTINGS(cts) == 0) { tgt = cts->ccb_h.target_id; } else if (xpt_path_sim(cts->ccb_h.path) == mpt->phydisk_sim) { if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt)) { @@ -3364,6 +3414,29 @@ pval = MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(pval); } +#ifndef CAM_NEW_TRAN_CODE + cts->flags &= ~(CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB); + cts->valid = 0; + cts->sync_period = pval; + cts->sync_offset = oval; + cts->valid |= CCB_TRANS_SYNC_RATE_VALID; + cts->valid |= CCB_TRANS_SYNC_OFFSET_VALID; + cts->valid |= CCB_TRANS_BUS_WIDTH_VALID; + if (dval & DP_WIDE) { + cts->bus_width = MSG_EXT_WDTR_BUS_16_BIT; + } else { + cts->bus_width = MSG_EXT_WDTR_BUS_8_BIT; + } + if (cts->ccb_h.target_lun != CAM_LUN_WILDCARD) { + cts->valid |= CCB_TRANS_DISC_VALID | CCB_TRANS_TQ_VALID; + if (dval & DP_DISC_ENABLE) { + cts->flags |= CCB_TRANS_DISC_ENB; + } + if (dval & DP_TQING_ENABLE) { + cts->flags |= CCB_TRANS_TAG_ENB; + } + } +#else spi->valid = 0; scsi->valid = 0; spi->flags = 0; @@ -3388,6 +3461,7 @@ spi->flags |= CTS_SPI_FLAGS_DISC_ENB; } } +#endif mpt_lprt(mpt, MPT_PRT_NEGOTIATION, "mpt_get_spi_settings[%d]: %s flags 0x%x per 0x%x off=%d\n", tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", dval, pval, oval); From owner-p4-projects@FreeBSD.ORG Mon Dec 18 00:05:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D26916A415; Mon, 18 Dec 2006 00:05:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 481E016A407 for ; Mon, 18 Dec 2006 00:05:38 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1801A43CA5 for ; Mon, 18 Dec 2006 00:05:38 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI05bqw064908 for ; Mon, 18 Dec 2006 00:05:37 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI05b1W064905 for perforce@freebsd.org; Mon, 18 Dec 2006 00:05:37 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 18 Dec 2006 00:05:37 GMT Message-Id: <200612180005.kBI05b1W064905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 00:05:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111857 Change 111857 by mjacob@mjexp on 2006/12/18 00:05:00 Correct a misreading of the uuid_to_string man page so we actually encode the uuid as a string correctly. Affected files ... .. //depot/projects/mjexp/sbin/geom/class/multipath/geom_multipath.c#3 edit Differences ... ==== //depot/projects/mjexp/sbin/geom/class/multipath/geom_multipath.c#3 (text+ko) ==== @@ -150,12 +150,13 @@ gctl_error(req, "cannot create a UUID."); return; } - ptr = md.md_uuid; uuid_to_string(&uuid, &ptr, &status); if (status != uuid_s_ok) { gctl_error(req, "cannot stringify a UUID."); return; } + strlcpy(md.md_uuid, ptr, sizeof (md.md_uuid)); + free(ptr); /* * Clear last sector first for each provider to spoil anything extant From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:27:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1F0916A415; Mon, 18 Dec 2006 01:27:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5DEF16A407 for ; Mon, 18 Dec 2006 01:27:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8505143CBA for ; Mon, 18 Dec 2006 01:27:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1RMPQ086502 for ; Mon, 18 Dec 2006 01:27:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1RMFO086499 for perforce@freebsd.org; Mon, 18 Dec 2006 01:27:22 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:27:22 GMT Message-Id: <200612180127.kBI1RMFO086499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=111861 Change 111861 by imp@imp_bugs on 2006/12/18 01:26:24 Fix register offsets for pullup enable/disable registers Submitted by: Patrick Schweiger Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#5 (text+ko) ==== @@ -52,8 +52,8 @@ #define PIO_MDDR 0x54 /* PIO Multi-Driver Disable Register */ #define PIO_MDSR 0x58 /* PIO Multi-Driver Status Register */ /* 0x5c reserved */ -#define PIO_PUER 0x60 /* PIO Pull-up Enable Register */ -#define PIO_PUDR 0x64 /* PIO Pull-up Disable Register */ +#define PIO_PUDR 0x60 /* PIO Pull-up Disable Register */ +#define PIO_PUER 0x64 /* PIO Pull-up Enable Register */ #define PIO_PUSR 0x68 /* PIO Pull-up Status Register */ /* 0x6c reserved */ #define PIO_ASR 0x70 /* PIO Peripheral A Select Register */ From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:28:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BC5416A47B; Mon, 18 Dec 2006 01:28:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A904C16A415 for ; Mon, 18 Dec 2006 01:28:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62EBD43CBC for ; Mon, 18 Dec 2006 01:28:24 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1SOVL086562 for ; Mon, 18 Dec 2006 01:28:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1SNZg086559 for perforce@freebsd.org; Mon, 18 Dec 2006 01:28:23 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:28:23 GMT Message-Id: <200612180128.kBI1SNZg086559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=111862 Change 111862 by imp@imp_bugs on 2006/12/18 01:28:18 Add at91_bbiic attachment Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#26 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#26 (text+ko) ==== @@ -309,6 +309,7 @@ AT91RM92_BASE + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI }, + { "at91_bbiic", 0, 0, 0, 0 }, { "at91_twi", 0, AT91RM92_BASE + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:29:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E41816A47B; Mon, 18 Dec 2006 01:29:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69CE016A403 for ; Mon, 18 Dec 2006 01:29:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20F2143CA2 for ; Mon, 18 Dec 2006 01:29:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1TPbR086605 for ; Mon, 18 Dec 2006 01:29:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1TP9u086602 for perforce@freebsd.org; Mon, 18 Dec 2006 01:29:25 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:29:25 GMT Message-Id: <200612180129.kBI1TP9u086602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:29:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=111863 Change 111863 by imp@imp_bugs on 2006/12/18 01:29:19 Add glue for at91_bbiic Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91#14 (text) ==== @@ -2,6 +2,7 @@ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard +arm/at91/at91_bbiic.c optional at91_bbiic arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:31:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1986F16A47C; Mon, 18 Dec 2006 01:31:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E715616A416 for ; Mon, 18 Dec 2006 01:31:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5B9D43CAE for ; Mon, 18 Dec 2006 01:31:29 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1VTAx087311 for ; Mon, 18 Dec 2006 01:31:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1VT4J087304 for perforce@freebsd.org; Mon, 18 Dec 2006 01:31:29 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:31:29 GMT Message-Id: <200612180131.kBI1VT4J087304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111864 Change 111864 by imp@imp_bugs on 2006/12/18 01:30:33 Switch from 6-0 addressing to 7-1 addressing that the drivers expect. Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/icee.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/icee.c#8 (text+ko) ==== @@ -178,13 +178,13 @@ uio->uio_resid); switch (sc->type) { case 8: - slave = (uio->uio_offset >> 8) | sc->addr; + slave = (uio->uio_offset >> 7) | sc->addr; msgs[0].len = 1; msgs[1].len = len; addr[0] = uio->uio_offset & 0xff; break; case 16: - slave = sc->addr | (uio->uio_offset >> 16); + slave = sc->addr | (uio->uio_offset >> 15); msgs[0].len = 2; msgs[1].len = len; addr[0] = (uio->uio_offset >> 8) & 0xff; From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:32:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A260916A416; Mon, 18 Dec 2006 01:32:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68CF516A415 for ; Mon, 18 Dec 2006 01:32:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3611B43CA9 for ; Mon, 18 Dec 2006 01:32:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1WVhp087568 for ; Mon, 18 Dec 2006 01:32:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1WUBf087565 for perforce@freebsd.org; Mon, 18 Dec 2006 01:32:30 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:32:30 GMT Message-Id: <200612180132.kBI1WUBf087565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:32:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=111865 Change 111865 by imp@imp_bugs on 2006/12/18 01:31:36 Yet another attachment. Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#7 (text+ko) ==== @@ -422,6 +422,7 @@ DRIVER_MODULE(iicbb, lpbb, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, viapm, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, cxm_iic, iicbb_driver, iicbb_devclass, 0, 0); +DRIVER_MODULE(iicbb, at91_bbiic, iicbb_driver, iicbb_devclass, 0, 0); MODULE_DEPEND(iicbb, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(iicbb, IICBB_MODVER); From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:38:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 109C616A417; Mon, 18 Dec 2006 01:38:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C619B16A412 for ; Mon, 18 Dec 2006 01:38:40 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40A5343CA4 for ; Mon, 18 Dec 2006 01:38:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1cden088261 for ; Mon, 18 Dec 2006 01:38:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1ccAp088258 for perforce@freebsd.org; Mon, 18 Dec 2006 01:38:38 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:38:38 GMT Message-Id: <200612180138.kBI1ccAp088258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111866 Change 111866 by imp@imp_bugs on 2006/12/18 01:38:03 Experimentally switch to bit-bang interface. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#19 edit .. //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#7 edit .. //depot/projects/arm/src/sys/arm/conf/TSC4370RAM#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#19 (text+ko) ==== @@ -1,4 +1,5 @@ -# TSC4370 -- Kernel +# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 +# AT91RM9200 evaluation boards from kwikbyte.com. # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -43,7 +44,7 @@ #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" -options ROOTDEVNAME=\"ufs:mmcsd0s1a\" +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as /, requires NFSCLIENT @@ -64,6 +65,8 @@ options MUTEX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING +options PPS_SYNC # ntp time sync with pps +options ARM32_NEW_VM_LAYOUT device genclock device loop device random @@ -91,10 +94,12 @@ device mem # Memory and kernel memory devices device md -device at91_twi # TWI: Two Wire Interface +#device at91_twi # TWI: Two Wire Interface +device at91_bbiic # TWI: Two Wire Interface, bit bang device at91_spi # SPI bridge support device at91_ssc device at91_tc +# MMC device at91_mci device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards @@ -102,6 +107,7 @@ device iic device iicbus device icee +device iicbb # SPI bus device spibus device at45d # at45db642 and maybe others @@ -110,3 +116,7 @@ # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter + +# Enable support for the kernel PLL to use an external PPS signal, +options PPS_SYNC + ==== //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $TSC$ +# $TSC: Release/arm/kern/TSC4370.hints,v 1.3 2006/12/11 22:29:53 imp Exp $ hint.at45d.0.at="spibus0" hint.at45d.0.cs=0 # ID Eeprom ==== //depot/projects/arm/src/sys/arm/conf/TSC4370RAM#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:40:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91CE916A417; Mon, 18 Dec 2006 01:40:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54F1416A403 for ; Mon, 18 Dec 2006 01:40:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 251F543C9F for ; Mon, 18 Dec 2006 01:40:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1I95d084932 for ; Mon, 18 Dec 2006 01:18:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1I9oS084929 for perforce@freebsd.org; Mon, 18 Dec 2006 01:18:09 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:18:09 GMT Message-Id: <200612180118.kBI1I9oS084929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=111859 Change 111859 by imp@imp_bugs on 2006/12/18 01:17:31 more low-level interfaces Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#5 (text+ko) ==== @@ -33,7 +33,9 @@ void at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask); void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, int use_pullup); +void at91_pio_gpio_high_z(uint32_t pio, uint32_t high_z_mask, int enable); void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); +uint32_t at91_pio_gpio_read(uint32_t pio, uint32_t data_mask); #endif /* ARM_AT91_AT91_PIOVAR_H */ From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:40:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBAD216A55E; Mon, 18 Dec 2006 01:40:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 849DC16A415 for ; Mon, 18 Dec 2006 01:40:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 554DA43CA2 for ; Mon, 18 Dec 2006 01:40:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI1KDai085042 for ; Mon, 18 Dec 2006 01:20:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1KCXl085031 for perforce@freebsd.org; Mon, 18 Dec 2006 01:20:12 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 01:20:12 GMT Message-Id: <200612180120.kBI1KCXl085031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:40:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=111860 Change 111860 by imp@imp_bugs on 2006/12/18 01:19:36 Implementations for new rouintes. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#26 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#26 (text+ko) ==== @@ -478,6 +478,17 @@ } void +at91_pio_gpio_high_z(uint32_t pio, uint32_t high_z_mask, int enable) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + if (enable) + PIO[PIO_MDER / 4] = high_z_mask; + else + PIO[PIO_MDDR / 4] = high_z_mask; +} + +void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask) { uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); @@ -493,6 +504,14 @@ PIO[PIO_CODR / 4] = data_mask; } +uint32_t +at91_pio_gpio_read(uint32_t pio, uint32_t data_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + return PIO[PIO_PDSR / 4] & data_mask; +} + static device_method_t at91_pio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_pio_probe), From owner-p4-projects@FreeBSD.ORG Mon Dec 18 01:40:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF1D616A5DB; Mon, 18 Dec 2006 01:40:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8D8A316A5D9 for ; Mon, 18 Dec 2006 01:40:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4456543C9F for ; Mon, 18 Dec 2006 01:40:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI0sejs080608 for ; Mon, 18 Dec 2006 00:54:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI0seSO080605 for perforce@freebsd.org; Mon, 18 Dec 2006 00:54:40 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Dec 2006 00:54:40 GMT Message-Id: <200612180054.kBI0seSO080605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 01:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=111858 Change 111858 by imp@imp_bugs on 2006/12/18 00:54:01 Experimental bit bang iic interface. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_bbiic.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 18 03:17:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE1AE16A40F; Mon, 18 Dec 2006 03:17:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EC3F16A403 for ; Mon, 18 Dec 2006 03:17:48 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 476F743CA2 for ; Mon, 18 Dec 2006 03:17:48 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI3HmiM006853 for ; Mon, 18 Dec 2006 03:17:48 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI3HmHf006850 for perforce@freebsd.org; Mon, 18 Dec 2006 03:17:48 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 18 Dec 2006 03:17:48 GMT Message-Id: <200612180317.kBI3HmHf006850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 03:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=111872 Change 111872 by mjacob@mjexp on 2006/12/18 03:17:32 More toy cleanups that allow new GEOMs to be tasted and come alive even if the names are the same. That is, the UUID is the real distinguishor, but using UUIDs is a PITA as a 'friendly' name. So, if you are doing a taste and you have a new UUID, but it has a name that conflicts, gen up a (temp) *new* name and let the new GEOM come in. Generalize the geom stuff to just have a list of consumers waiting to become active rather than just a two-consumer case. Put lots more informative messaging in. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#5 edit .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.h#4 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#5 (text+ko) ==== @@ -87,16 +87,19 @@ struct bio *cbp; gp = bp->bio_to->geom; + sc = gp->softc; + KASSERT(sc != NULL, ("NULL sc")); + cp = sc->cp_active; + if (cp == NULL) { + g_io_deliver(bp, ENXIO); + return; + } cbp = g_clone_bio(bp); if (cbp == NULL) { g_io_deliver(bp, ENOMEM); return; } cbp->bio_done = g_multipath_done; - sc = gp->softc; - KASSERT(sc != NULL, ("NULL sc")); - cp = sc->consumers[sc->cur_prov]; - KASSERT(cp != NULL, ("NULL cp")); g_io_request(cbp, cp); } @@ -109,10 +112,6 @@ int dofail; KASSERT(sc != NULL, ("NULL sc")); - if (sc->ready == 0) { - g_std_done(bp); - return; - } if (bp->bio_error == ENXIO || bp->bio_error == EIO) { dofail = 1; @@ -130,21 +129,39 @@ dofail = 0; } - /* XXX yes, this only handles single failures XXX */ if (dofail) { - if ((pbp->bio_pflags & G_MULTIPATH_BIO_PFLAG_ERROR) == 0) { - struct g_provider *pp0, *pp1; - pp0 = sc->providers[sc->cur_prov]; - sc->cur_prov++; - pp1 = sc->providers[sc->cur_prov]; - pbp->bio_pflags |= G_MULTIPATH_BIO_PFLAG_ERROR; - printf("error %d: switching from provider %s to" - " provider %s\n", bp->bio_error, - pp0->name, pp1->name); + struct g_consumer *cp = bp->bio_from; + + /* + * If we had a failure, we have to check first to see + * whether the consumer it failed on was the currently + * active consumer (i.e., this is the first in perhaps + * a number of failures). If so, we then switch consumers + * to the next available consumer. + */ + if (cp == sc->cp_active) { + printf("i/o failure is causing detach of %s from %s\n", + cp->provider->name, gp->name); +/* + * XXX: The following two lines are probably wrong due to inflights + */ + g_detach(cp); + g_destroy_consumer(cp); + sc->cp_active = LIST_FIRST(&gp->consumer); + } + + /* + * If we can fruitfully restart the I/O, do so. + */ + if (sc->cp_active) { + printf("switching to provider %s\n", + sc->cp_active->provider->name); g_destroy_bio(bp); pbp->bio_children--; g_multipath_start(pbp); return; + } else { + printf("out of providers to try\n"); } } g_std_done(bp); @@ -156,21 +173,26 @@ g_multipath_access(struct g_provider *pp, int dr, int dw, int de) { struct g_geom *gp; - struct g_multipath_softc *sc; + struct g_consumer *cp, *badcp = NULL; int error; gp = pp->geom; - sc = gp->softc; - KASSERT(sc != NULL, ("NULL sc")); - if (sc->ready == 0) { - return (ENXIO); + + LIST_FOREACH(cp, &gp->consumer, consumer) { + error = g_access(cp, dr, dw, de); + if (error) { + badcp = cp; + goto fail; + } } - error = g_access(sc->consumers[0], dr, dw, de); - if (error == 0) { - error = g_access(sc->consumers[1], dr, dw, de); - if (error) { - (void) g_access(sc->consumers[0], -dr, -dw, -de); + return (0); + +fail: + LIST_FOREACH(cp, &gp->consumer, consumer) { + if (cp == badcp) { + break; } + (void) g_access(cp, -dr, -dw, -de); } return (error); } @@ -180,18 +202,15 @@ { struct g_multipath_softc *sc; struct g_geom *gp; - struct g_provider *newpp; - struct g_consumer *cp0, *cp1; + struct g_provider *pp; char name[64]; g_topology_assert(); - gp = NULL; - newpp = NULL; - cp0 = cp1 = NULL; - LIST_FOREACH(gp, &mp->geom, geom) { if (strcmp(gp->name, md->md_name) == 0) { + printf("GEOM_MULTIPATH: name %s already exists\n", + md->md_name); return (NULL); } } @@ -214,15 +233,15 @@ memcpy(sc->sc_name, md->md_name, sizeof (sc->sc_name)); snprintf(name, sizeof(name), "multipath/%s", md->md_name); - newpp = g_new_providerf(gp, name); - if (newpp == NULL) { + pp = g_new_providerf(gp, name); + if (pp == NULL) { goto fail; } /* limit the provider to not have it stomp on metadata */ - newpp->mediasize = md->md_size - md->md_sectorsize; - newpp->sectorsize = md->md_sectorsize; - g_error_provider(newpp, 0); - sc->pp = newpp; + pp->mediasize = md->md_size - md->md_sectorsize; + pp->sectorsize = md->md_sectorsize; + g_error_provider(pp, 0); + sc->pp = pp; return (gp); fail: if (gp != NULL) { @@ -238,38 +257,46 @@ g_multipath_add_disk(struct g_geom *gp, struct g_provider *pp) { struct g_multipath_softc *sc; - struct g_consumer *cp; + struct g_consumer *cp, *nxtcp; int error; sc = gp->softc; KASSERT(sc, ("no softc")); - if (sc->nattached >= 2) { - printf("cannot attach %s to %s (%d disks already attached)\n", - pp->name, gp->name, sc->nattached); - return (EINVAL); - } - + nxtcp = LIST_FIRST(&gp->consumer); cp = g_new_consumer(gp); if (cp == NULL) { return (ENOMEM); } error = g_attach(cp, pp); if (error != 0) { - printf("Cannot attach provider %s", pp->name); + printf("cannot attach %s to %s", pp->name, sc->sc_name); g_destroy_consumer(cp); return (error); } cp->private = sc; - cp->index = 0; + cp->index = sc->index++; - sc->consumers[sc->nattached] = cp; - sc->providers[sc->nattached] = pp; - sc->nattached++; - if (sc->nattached == 2) { - printf("activating %s\n", sc->sc_name); - sc->ready = 1; + /* + * Set access permissions on new consumer to match other consumers + */ + if (nxtcp) { + error = g_access(cp, nxtcp->acr, nxtcp->acw, nxtcp->ace); + if (error) { + printf("GEOM_MULTIPATH: cannot set access in " + "attaching %s to %s/%s (%d)\n", + pp->name, sc->sc_name, sc->sc_uuid, error); + g_detach(cp); + g_destroy_consumer(cp); + return (error); + } + } + if (sc->cp_active == NULL) { + sc->cp_active = cp; + printf("GEOM_MULTIPATH: activating %s/%s\n", + sc->sc_name, sc->sc_uuid); } + printf("GEOM_MULTIPATH: adding %s to %s\n", pp->name, sc->sc_name); return (0); } @@ -332,7 +359,7 @@ struct g_multipath_metadata md; struct g_multipath_softc *sc; struct g_consumer *cp; - struct g_geom *gp; + struct g_geom *gp, *gp1; int error, isnew; g_topology_assert(); @@ -348,11 +375,15 @@ g_destroy_consumer(cp); g_destroy_geom(gp); if (error != 0) { + printf("%s had error %d reading metadata\n", pp->name, error); return (NULL); } gp = NULL; if (strcmp(md.md_magic, G_MULTIPATH_MAGIC) != 0) { + if (g_multipath_debug) { + printf("%s is not MULTIPATH\n", pp->name); + } return (NULL); } if (md.md_version != G_MULTIPATH_VERSION) { @@ -361,12 +392,20 @@ G_MULTIPATH_VERSION); return (NULL); } + if (g_multipath_debug) { + printf("MULTIPATH: %s/%s\n", md.md_name, md.md_uuid); + } /* * Let's check if such a device already is present. We check against - * uuid alone at first because that's the true distinguishor. After - * that test passes, we run through and make sure that the name is - * unique and if it isn't, we generate a name. + * uuid alone first because that's the true distinguishor. If that + * passes, then we check for name conflicts. If there are conflicts, + * modify the name. + * + * The whole purpose of this is to solve the problem that people don't + * pick good unique names, but good unique names (like uuids) are a + * pain to use. So, we allow people to build GEOMs with friendly names + * and uuids, and modify the names in case there's a collision. */ sc = NULL; LIST_FOREACH(gp, &mp->geom, geom) { @@ -379,31 +418,58 @@ } } + LIST_FOREACH(gp1, &mp->geom, geom) { + if (gp1 == gp) { + continue; + } + sc = gp1->softc; + if (sc == NULL) { + continue; + } + if (strncmp(md.md_name, sc->sc_name, sizeof(md.md_name)) == 0) { + break; + } + } + + /* + * If gp is NULL, we had no extant MULTIPATH geom with this uuid. + * + * If gp1 is *not* NULL, that means we have a MULTIPATH geom extant + * with the same name (but a different UUID). + * + * If gp is NULL, then modify the name with a random number and + * complain, but allow the creation of the geom to continue. + * + * If gp is *not* NULL, just use the geom's name as we're attaching + * this disk to the (previously generated) name. + */ + + if (gp1) { + sc = gp1->softc; + if (gp == NULL) { + char buf[16]; + u_long rand = random(); + + snprintf(buf, sizeof (buf), "%s-%lu", md.md_name, rand); + printf("GEOM_MULTIPATH: geom %s/%s exists already\n", + sc->sc_name, sc->sc_uuid); + printf("GEOM_MULTIPATH: %s will be (temporarily) %s\n", + md.md_uuid, buf); + strlcpy(md.md_name, buf, sizeof (md.md_name)); + } else { + strlcpy(md.md_name, sc->sc_name, sizeof (md.md_name)); + } + } + if (gp == NULL) { gp = g_multipath_create(mp, &md); if (gp == NULL) { - printf("cannot create geom %s\n", md.md_name); + printf("GEOM_MULTIPATH: cannot create geom %s/%s\n", + md.md_name, md.md_uuid); return (NULL); } isnew = 1; } else { - struct g_geom *gp1; - LIST_FOREACH(gp1, &mp->geom, geom) { - sc = gp1->softc; - if (sc == NULL) { - continue; - } - if (strncmp(md.md_name, sc->sc_name, - sizeof(md.md_name)) == 0) { - break; - } - } - if (gp1 != NULL) { - printf("cannot add %s to %s because %s already exists " - "with a different uuid\n", pp->name, gp1->name, - gp1->name); - return (NULL); - } isnew = 0; } ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.h#4 (text+ko) ==== @@ -42,17 +42,12 @@ #ifdef _KERNEL -#define G_MULTIPATH_BIO_PFLAG_ERROR 0x1 struct g_multipath_softc { struct g_provider * pp; - unsigned int : 28, - nattached : 2, - ready : 1, - cur_prov : 1; - struct g_consumer * consumers[2]; - struct g_provider * providers[2]; + struct g_consumer * cp_active; char sc_name[16]; char sc_uuid[40]; + int index; }; #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon Dec 18 03:38:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E33316A40F; Mon, 18 Dec 2006 03:38:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1DE0C16A403 for ; Mon, 18 Dec 2006 03:38:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE54F43C9F for ; Mon, 18 Dec 2006 03:38:40 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI3In0K006910 for ; Mon, 18 Dec 2006 03:18:49 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI3InM9006907 for perforce@freebsd.org; Mon, 18 Dec 2006 03:18:49 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 18 Dec 2006 03:18:49 GMT Message-Id: <200612180318.kBI3InM9006907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 03:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111873 Change 111873 by mjacob@mjexp on 2006/12/18 03:18:20 Add a longer timeout for the EXEC_A64_IOCB command and make it consistent across the 3 places that use it for the 24XX cards. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#5 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#5 (text+ko) ==== @@ -2151,8 +2151,8 @@ mbs.param[3] = DMA_WD0(FCPARAM(isp)->isp_scdma); mbs.param[6] = DMA_WD3(FCPARAM(isp)->isp_scdma); mbs.param[7] = DMA_WD2(FCPARAM(isp)->isp_scdma); + mbs.timeout = 500000; mbs.logval = MBLOGALL; - mbs.timeout = 250000; MEMORYBARRIER(isp, SYNC_SFORDEV, 0, QENTRY_LEN); isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { @@ -3224,6 +3224,7 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF); mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF); mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF); + mbs.timeout = 500000; mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN); isp_mboxcmd(isp, &mbs); @@ -3902,6 +3903,7 @@ mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF); mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF); mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF); + mbs.timeout = 500000; mbs.logval = MBLOGALL; MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN); isp_mboxcmd(isp, &mbs); From owner-p4-projects@FreeBSD.ORG Mon Dec 18 05:49:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F81C16A417; Mon, 18 Dec 2006 05:49:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 045B316A403 for ; Mon, 18 Dec 2006 05:49:02 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AFD843CA6 for ; Mon, 18 Dec 2006 05:48:57 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBI5mvR9041116 for ; Mon, 18 Dec 2006 05:48:57 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI5mvWT041113 for perforce@freebsd.org; Mon, 18 Dec 2006 05:48:57 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 18 Dec 2006 05:48:57 GMT Message-Id: <200612180548.kBI5mvWT041113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 05:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=111875 Change 111875 by mjacob@mjexp_6 on 2006/12/18 05:48:48 Glork enough of releng_6 into this tree to do some geom playpens here. Affected files ... .. //depot/projects/mjexp_6/sbin/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sbin/geom/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/label/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/label/geom_label.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/label/glabel.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/mirror/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/mirror/geom_mirror.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/mirror/gmirror.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/raid3/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/raid3/geom_raid3.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/raid3/graid3.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/shsec/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/shsec/geom_shsec.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/shsec/gshsec.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/core/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/core/geom.8#1 branch .. //depot/projects/mjexp_6/sbin/geom/core/geom.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/core/geom.h#1 branch .. //depot/projects/mjexp_6/sbin/geom/misc/subr.c#1 branch .. //depot/projects/mjexp_6/sbin/geom/misc/subr.h#1 branch .. //depot/projects/mjexp_6/sys/Makefile#1 branch .. //depot/projects/mjexp_6/sys/alpha/Makefile#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/support.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/mjexp_6/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/mjexp_6/sys/alpha/conf/Makefile#1 branch .. //depot/projects/mjexp_6/sys/alpha/conf/NOTES#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/_bus.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/_limits.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/_types.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/asm.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/atomic.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/bus.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/bwx.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/chipset.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/clock.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/cpu.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/elf.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/endian.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/exec.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/float.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/fpu.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/frame.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ieee.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/inst.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/intr.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/kdb.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/limits.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/md_var.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/memdev.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/mutex.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pal.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/param.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pcb.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pmap.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/proc.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/profile.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/prom.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/pte.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/reg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/reloc.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/resource.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/rpb.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/runq.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/signal.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/smp.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/swiz.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/varargs.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/isa/isa.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/Makefile#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/mjexp_6/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/mjexp_6/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/cia.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/lca.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/t2.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/mjexp_6/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/Makefile#1 branch .. //depot/projects/mjexp_6/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/io.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/support.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/Makefile#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/NOTES#1 branch .. //depot/projects/mjexp_6/sys/amd64/conf/SMP#1 branch .. //depot/projects/mjexp_6/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/_bus.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/_limits.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/_types.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/asm.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/atomic.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/bus.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/clock.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/cpu.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/elf.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/endian.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/exec.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/float.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/fpu.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/frame.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/iodev.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/kdb.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/limits.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/md_var.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/memdev.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/metadata.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/minidump.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/mptable.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/mutex.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/param.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pcb.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pmap.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/proc.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/profile.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/psl.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/reg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/reloc.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/resource.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/runq.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/segments.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/signal.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/smp.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/trap.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/tss.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/varargs.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/clock.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/icu.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/isa.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/isa.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/mjexp_6/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/mjexp_6/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/blockio.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/copystr.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/disassem.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/exception.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/fiq.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/fusu.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/genassym.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/inckern.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/intr.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/locore.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/mem.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/nexus.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/pmap.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/setstack.s#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/support.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/swtch.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/trap.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/undefined.c#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/vectors.S#1 branch .. //depot/projects/mjexp_6/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/at91var.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/files.at91#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/std.at91#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/mjexp_6/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/mjexp_6/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/mjexp_6/sys/arm/conf/IQ31244#1 branch .. //depot/projects/mjexp_6/sys/arm/conf/KB920X#1 branch .. //depot/projects/mjexp_6/sys/arm/conf/SIMICS#1 branch .. //depot/projects/mjexp_6/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/mjexp_6/sys/arm/include/_bus.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/_limits.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/_stdint.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/_types.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/armreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/asm.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/asmacros.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/atomic.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/blockio.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/bus.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/clock.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/cpu.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/disassem.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/elf.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/endian.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/exec.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/fiq.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/float.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/fp.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/frame.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/ieee.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/intr.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/katelib.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/kdb.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/limits.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/machdep.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/md_var.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/memdev.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/metadata.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/mutex.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/param.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/pcb.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/pcpu.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/pmap.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/proc.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/profile.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/psl.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/pte.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/ptrace.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/reg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/reloc.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/resource.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/runq.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/setjmp.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/sigframe.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/signal.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/smp.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/stdarg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/swi.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/sysarch.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/trap.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/ucontext.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/undefined.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/utrap.h#1 branch .. //depot/projects/mjexp_6/sys/arm/include/vmparam.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/mjexp_6/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/mjexp_6/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/mjexp_6/sys/boot/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/README#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/common/ldscript#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/loader/version#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arc/loader/version#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/mjexp_6/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/mjexp_6/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/common/bcache.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/boot.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/mjexp_6/sys/boot/common/commands.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/console.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/dev_net.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/dev_net.h#1 branch .. //depot/projects/mjexp_6/sys/boot/common/devopen.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/help.common#1 branch .. //depot/projects/mjexp_6/sys/boot/common/interp.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/isapnp.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/isapnp.h#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/loader.8#1 branch .. //depot/projects/mjexp_6/sys/boot/common/ls.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/mjexp_6/sys/boot/common/misc.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/newvers.sh#1 branch .. //depot/projects/mjexp_6/sys/boot/common/panic.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/pnp.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/pnpdata#1 branch .. //depot/projects/mjexp_6/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/mjexp_6/sys/boot/common/ufsread.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/README#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/dict.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/float.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/loader.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/math64.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/math64.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/search.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/stack.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/tools.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/unix.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/vm.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ficl/words.c#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/frames.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/loader.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/loader.conf#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/loader.rc#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/screen.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/forth/support.4th#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/loader/version#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/mjexp_6/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/efi/version#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ia64/ski/version#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/mjexp_6/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/mjexp_6/sys/boot/pc98/Makefile#1 branch .. //depot/projects/mjexp_6/sys/boot/pc98/Makefile.inc#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 18 12:44:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B5C516A40F; Mon, 18 Dec 2006 12:44:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E10E16A417 for ; Mon, 18 Dec 2006 12:44:50 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F7A43C9F for ; Mon, 18 Dec 2006 12:44:49 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBICino3023247 for ; Mon, 18 Dec 2006 12:44:49 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBICinew023244 for perforce@freebsd.org; Mon, 18 Dec 2006 12:44:49 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 18 Dec 2006 12:44:49 GMT Message-Id: <200612181244.kBICinew023244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 12:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=111890 Change 111890 by zec@zec_tca51 on 2006/12/18 12:44:16 Add a note about "option VIMAGE" in the NOTES config file. This submission also serves as an experiment to see if the change will be automatically propagated to the p4->cvsup mirror, given that there is a .cvsignore file in the directory containing the "NOTES" file. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/NOTES#2 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/NOTES#2 (text+ko) ==== @@ -248,8 +248,14 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. +# +# VIMAGE adds support for maintaining multiple independent network stack +# state instances in the kernel. This feature is still in early +# experimental phase, and needs more thought, testing, and documentation. +# options DEVICE_POLLING +options VIMAGE ##################################################################### @@ -1214,5 +1220,3 @@ # asr old ioctls support, needed by raidutils - -options ASR_COMPAT From owner-p4-projects@FreeBSD.ORG Mon Dec 18 12:57:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F326A16A417; Mon, 18 Dec 2006 12:57:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B61E516A40F for ; Mon, 18 Dec 2006 12:57:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DAB143CAA for ; Mon, 18 Dec 2006 12:57:15 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBICv6oh032984 for ; Mon, 18 Dec 2006 12:57:06 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBICv6Sl032981 for perforce@freebsd.org; Mon, 18 Dec 2006 12:57:06 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 18 Dec 2006 12:57:06 GMT Message-Id: <200612181257.kBICv6Sl032981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 12:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111891 Change 111891 by zec@zec_tca51 on 2006/12/18 12:56:47 Bring back two lines that were accidentally removed in previous commit. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/NOTES#3 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/NOTES#3 (text+ko) ==== @@ -1220,3 +1220,5 @@ # asr old ioctls support, needed by raidutils + +options ASR_COMPAT From owner-p4-projects@FreeBSD.ORG Mon Dec 18 13:17:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1100716A40F; Mon, 18 Dec 2006 13:17:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E12E216A403 for ; Mon, 18 Dec 2006 13:17:33 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99F0443CA3 for ; Mon, 18 Dec 2006 13:17:33 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIDHX98037271 for ; Mon, 18 Dec 2006 13:17:33 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIDHXOt037268 for perforce@freebsd.org; Mon, 18 Dec 2006 13:17:33 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 18 Dec 2006 13:17:33 GMT Message-Id: <200612181317.kBIDHXOt037268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 13:17:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=111892 Change 111892 by zec@zec_tca51 on 2006/12/18 13:17:18 Temporarily remove the .cvsignore file in an attempt to complete the p4 -> cvsup synchronization. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/.cvsignore#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 18 13:55:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA5A516A4A7; Mon, 18 Dec 2006 13:55:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A21D16A49E for ; Mon, 18 Dec 2006 13:55:29 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44D1D43C9F for ; Mon, 18 Dec 2006 13:55:29 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIDtLsh043551 for ; Mon, 18 Dec 2006 13:55:21 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIDtKcl043548 for perforce@freebsd.org; Mon, 18 Dec 2006 13:55:20 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 18 Dec 2006 13:55:20 GMT Message-Id: <200612181355.kBIDtKcl043548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 13:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=111893 Change 111893 by zec@zec_tpx32 on 2006/12/18 13:54:41 First pass on virtualizing the IP datagram reassembly process. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_var.h#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#5 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_var.h#3 (text+ko) ==== @@ -92,16 +92,25 @@ extern u_long in_ifaddrhmask; /* mask for hash table */ #endif +/* + * IP datagram reassembly. + */ +#define IPREASS_NHASH_LOG2 6 +#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) +#define IPREASS_HMASK (IPREASS_NHASH - 1) +#define IPREASS_HASH(x,y) \ + (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) + +/* + * Macro for finding the internet address structure (in_ifaddr) + * corresponding to one of our IP addresses (in_addr). + */ #define INADDR_NHASH_LOG2 9 #define INADDR_NHASH (1 << INADDR_NHASH_LOG2) #define INADDR_HASHVAL(x) fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT) #define INADDR_HASH(x) \ (&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask]) -/* - * Macro for finding the internet address structure (in_ifaddr) - * corresponding to one of our IP addresses (in_addr). - */ #define INADDR_TO_IFADDR(addr, ia) \ /* struct in_addr addr; */ \ /* struct in_ifaddr *ia; */ \ ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#5 (text+ko) ==== @@ -160,18 +160,14 @@ SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW, ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)"); -/* - * IP datagram reassembly. - */ -#define IPREASS_NHASH_LOG2 6 -#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) -#define IPREASS_HMASK (IPREASS_NHASH - 1) -#define IPREASS_HASH(x,y) \ - (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) - +static struct mtx ipqlock; +#ifndef VIMAGE +static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH]; static uma_zone_t ipq_zone; -static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH]; -static struct mtx ipqlock; +static int nipq = 0; /* Total # of reass queues */ +static int maxnipq; /* Administrative limit on # reass queues. */ +static int maxfragsperpacket; +#endif #define IPQ_LOCK() mtx_lock(&ipqlock) #define IPQ_UNLOCK() mtx_unlock(&ipqlock) @@ -181,14 +177,12 @@ static void maxnipq_update(void); static void ipq_zone_change(void *); -static int maxnipq; /* Administrative limit on # reass queues. */ -static int nipq = 0; /* Total # of reass queues */ -SYSCTL_INT(_net_inet_ip, OID_AUTO, fragpackets, CTLFLAG_RD, &nipq, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, fragpackets, + CTLFLAG_RD, nipq, 0, "Current number of IPv4 fragment reassembly queue entries"); -static int maxfragsperpacket; -SYSCTL_INT(_net_inet_ip, OID_AUTO, maxfragsperpacket, CTLFLAG_RW, - &maxfragsperpacket, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, maxfragsperpacket, + CTLFLAG_RW, maxfragsperpacket, 0, "Maximum number of IPv4 fragments allowed per packet"); struct callout ipport_tick_callout; @@ -262,6 +256,16 @@ V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); + /* Initialize IP reassembly queue. */ + IPQ_LOCK_INIT(); + for (i = 0; i < IPREASS_NHASH; i++) + TAILQ_INIT(&V_ipq[i]); + V_maxnipq = nmbclusters / 32; + V_maxfragsperpacket = 16; + V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, + NULL, UMA_ALIGN_PTR, 0); + maxnipq_update(); + #ifdef VIMAGE /* * Skip global initialization stuff @@ -298,16 +302,6 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - /* Initialize IP reassembly queue. */ - IPQ_LOCK_INIT(); - for (i = 0; i < IPREASS_NHASH; i++) - TAILQ_INIT(&ipq[i]); - maxnipq = nmbclusters / 32; - maxfragsperpacket = 16; - ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, - NULL, UMA_ALIGN_PTR, 0); - maxnipq_update(); - /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); ipport_tick(NULL); @@ -723,32 +717,34 @@ static void maxnipq_update(void) { + INIT_VNET_INET(curvnetb); /* * -1 for unlimited allocation. */ - if (maxnipq < 0) - uma_zone_set_max(ipq_zone, 0); + if (V_maxnipq < 0) + uma_zone_set_max(V_ipq_zone, 0); /* * Positive number for specific bound. */ - if (maxnipq > 0) - uma_zone_set_max(ipq_zone, maxnipq); + if (V_maxnipq > 0) + uma_zone_set_max(V_ipq_zone, V_maxnipq); /* * Zero specifies no further fragment queue allocation -- set the * bound very low, but rely on implementation elsewhere to actually * prevent allocation and reclaim current queues. */ - if (maxnipq == 0) - uma_zone_set_max(ipq_zone, 1); + if (V_maxnipq == 0) + uma_zone_set_max(V_ipq_zone, 1); } static void ipq_zone_change(void *tag) { + INIT_VNET_INET(curvnetb); - if (maxnipq > 0 && maxnipq < (nmbclusters / 32)) { - maxnipq = nmbclusters / 32; + if (V_maxnipq > 0 && V_maxnipq < (nmbclusters / 32)) { + V_maxnipq = nmbclusters / 32; maxnipq_update(); } } @@ -756,9 +752,10 @@ static int sysctl_maxnipq(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnetb); int error, i; - i = maxnipq; + i = V_maxnipq; error = sysctl_handle_int(oidp, &i, 0, req); if (error || !req->newptr) return (error); @@ -769,7 +766,7 @@ */ if (i < -1) return (EINVAL); - maxnipq = i; + V_maxnipq = i; maxnipq_update(); return (0); } @@ -802,7 +799,7 @@ u_short hash; /* If maxnipq or maxfragsperpacket are 0, never accept fragments. */ - if (maxnipq == 0 || maxfragsperpacket == 0) { + if (V_maxnipq == 0 || V_maxfragsperpacket == 0) { V_ipstat.ips_fragments++; V_ipstat.ips_fragdropped++; m_freem(m); @@ -813,7 +810,7 @@ hlen = ip->ip_hl << 2; hash = IPREASS_HASH(ip->ip_src.s_addr, ip->ip_id); - head = &ipq[hash]; + head = &V_ipq[hash]; IPQ_LOCK(); /* @@ -836,7 +833,7 @@ * Attempt to trim the number of allocated fragment queues if it * exceeds the administrative limit. */ - if ((nipq > maxnipq) && (maxnipq > 0)) { + if ((V_nipq > V_maxnipq) && (V_maxnipq > 0)) { /* * drop something from the tail of the current queue * before proceeding further @@ -844,11 +841,11 @@ struct ipq *q = TAILQ_LAST(head, ipqhead); if (q == NULL) { /* gak */ for (i = 0; i < IPREASS_NHASH; i++) { - struct ipq *r = TAILQ_LAST(&ipq[i], ipqhead); + struct ipq *r = TAILQ_LAST(&V_ipq[i], ipqhead); if (r) { V_ipstat.ips_fragtimeout += r->ipq_nfrags; - ip_freef(&ipq[i], r); + ip_freef(&V_ipq[i], r); break; } } @@ -898,19 +895,19 @@ * If first fragment to arrive, create a reassembly queue. */ if (fp == NULL) { - fp = uma_zalloc(ipq_zone, M_NOWAIT); + fp = uma_zalloc(V_ipq_zone, M_NOWAIT); if (fp == NULL) goto dropfrag; #ifdef MAC if (mac_init_ipq(fp, M_NOWAIT) != 0) { - uma_zfree(ipq_zone, fp); + uma_zfree(V_ipq_zone, fp); fp = NULL; goto dropfrag; } mac_create_ipq(m, fp); #endif TAILQ_INSERT_HEAD(head, fp, ipq_list); - nipq++; + V_nipq++; fp->ipq_nfrags = 1; fp->ipq_ttl = IPFRAGTTL; fp->ipq_p = ip->ip_p; @@ -1012,7 +1009,7 @@ next = 0; for (p = NULL, q = fp->ipq_frags; q; p = q, q = q->m_nextpkt) { if (GETIP(q)->ip_off != next) { - if (fp->ipq_nfrags > maxfragsperpacket) { + if (fp->ipq_nfrags > V_maxfragsperpacket) { V_ipstat.ips_fragdropped += fp->ipq_nfrags; ip_freef(head, fp); } @@ -1022,7 +1019,7 @@ } /* Make sure the last packet didn't have the IP_MF flag */ if (p->m_flags & M_FRAG) { - if (fp->ipq_nfrags > maxfragsperpacket) { + if (fp->ipq_nfrags > V_maxfragsperpacket) { V_ipstat.ips_fragdropped += fp->ipq_nfrags; ip_freef(head, fp); } @@ -1078,8 +1075,8 @@ ip->ip_src = fp->ipq_src; ip->ip_dst = fp->ipq_dst; TAILQ_REMOVE(head, fp, ipq_list); - nipq--; - uma_zfree(ipq_zone, fp); + V_nipq--; + uma_zfree(V_ipq_zone, fp); m->m_len += (ip->ip_hl << 2); m->m_data -= (ip->ip_hl << 2); /* some debugging cruft by sklower, below, will go away soon */ @@ -1110,6 +1107,7 @@ struct ipqhead *fhp; struct ipq *fp; { + INIT_VNET_INET(curvnetb); register struct mbuf *q; IPQ_LOCK_ASSERT(); @@ -1120,8 +1118,8 @@ m_freem(q); } TAILQ_REMOVE(fhp, fp, ipq_list); - uma_zfree(ipq_zone, fp); - nipq--; + uma_zfree(V_ipq_zone, fp); + V_nipq--; } /* @@ -1139,14 +1137,14 @@ VNETB_ITERLOOP_BEGIN(); INIT_VNET_INET(vnetb_iter); for (i = 0; i < IPREASS_NHASH; i++) { - for(fp = TAILQ_FIRST(&ipq[i]); fp;) { + for(fp = TAILQ_FIRST(&V_ipq[i]); fp;) { struct ipq *fpp; fpp = fp; fp = TAILQ_NEXT(fp, ipq_list); if(--fpp->ipq_ttl == 0) { V_ipstat.ips_fragtimeout += fpp->ipq_nfrags; - ip_freef(&ipq[i], fpp); + ip_freef(&V_ipq[i], fpp); } } } @@ -1155,12 +1153,12 @@ * (due to the limit being lowered), drain off * enough to get down to the new limit. */ - if (maxnipq >= 0 && nipq > maxnipq) { + if (V_maxnipq >= 0 && V_nipq > V_maxnipq) { for (i = 0; i < IPREASS_NHASH; i++) { - while (nipq > maxnipq && !TAILQ_EMPTY(&ipq[i])) { + while (V_nipq > V_maxnipq && !TAILQ_EMPTY(&V_ipq[i])) { V_ipstat.ips_fragdropped += - TAILQ_FIRST(&ipq[i])->ipq_nfrags; - ip_freef(&ipq[i], TAILQ_FIRST(&ipq[i])); + TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; + ip_freef(&V_ipq[i], TAILQ_FIRST(&V_ipq[i])); } } } @@ -1180,10 +1178,10 @@ VNETB_ITERLOOP_BEGIN(); INIT_VNET_INET(vnetb_iter); for (i = 0; i < IPREASS_NHASH; i++) { - while(!TAILQ_EMPTY(&ipq[i])) { + while(!TAILQ_EMPTY(&V_ipq[i])) { V_ipstat.ips_fragdropped += - TAILQ_FIRST(&ipq[i])->ipq_nfrags; - ip_freef(&ipq[i], TAILQ_FIRST(&ipq[i])); + TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; + ip_freef(&V_ipq[i], TAILQ_FIRST(&V_ipq[i])); } } VNETB_ITERLOOP_END(); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#6 (text+ko) ==== @@ -65,6 +65,12 @@ int _ipforwarding; + TAILQ_HEAD(ipqhead, ipq) _ipq[IPREASS_NHASH]; + uma_zone_t _ipq_zone; + int _nipq; /* Total # of reass queues */ + int _maxnipq; /* Admin. limit on # reass queues. */ + int _maxfragsperpacket; + struct inpcbhead _tcb; /* head of queue of active tcpcb's */ struct inpcbinfo _tcbinfo; struct tcpstat _tcpstat; /* tcp statistics */ @@ -112,6 +118,12 @@ #define V_ipforwarding VNET_INET(ipforwarding) +#define V_ipq VNET_INET(ipq) +#define V_ipq_zone VNET_INET(ipq_zone) +#define V_nipq VNET_INET(nipq) +#define V_maxnipq VNET_INET(maxnipq) +#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) + #define V_tcb VNET_INET(tcb) #define V_tcbinfo VNET_INET(tcbinfo) #define V_tcpstat VNET_INET(tcpstat) From owner-p4-projects@FreeBSD.ORG Mon Dec 18 14:37:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF71E16A415; Mon, 18 Dec 2006 14:37:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A8CC516A412 for ; Mon, 18 Dec 2006 14:37:18 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72CB343CA2 for ; Mon, 18 Dec 2006 14:37:18 +0000 (GMT) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIEbEhn051138 for ; Mon, 18 Dec 2006 14:37:14 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIEbE8F051135 for perforce@freebsd.org; Mon, 18 Dec 2006 14:37:14 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 18 Dec 2006 14:37:14 GMT Message-Id: <200612181437.kBIEbE8F051135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 111896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 14:37:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111896 Change 111896 by zec@zec_tca51 on 2006/12/18 14:36:35 Null-submit in an attempt to push the files bellow through the p4 -> cvsup synchronization process. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#2 edit .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#2 edit .. //depot/projects/vimage/src/sys/i386/conf/GENERIC.hints#2 edit .. //depot/projects/vimage/src/sys/i386/conf/MAC#2 edit .. //depot/projects/vimage/src/sys/i386/conf/Makefile#2 edit .. //depot/projects/vimage/src/sys/i386/conf/NOTES#4 edit .. //depot/projects/vimage/src/sys/i386/conf/PAE#2 edit .. //depot/projects/vimage/src/sys/i386/conf/VIMAGE#2 edit .. //depot/projects/vimage/src/sys/i386/conf/XBOX#2 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/GENERIC#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/MAC#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/Makefile#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/NOTES#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/PAE#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/VIMAGE#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/i386/conf/XBOX#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Dec 18 15:07:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D6A16A416; Mon, 18 Dec 2006 15:07:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D7A5316A412 for ; Mon, 18 Dec 2006 15:06:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F5A043C9F for ; Mon, 18 Dec 2006 15:06:59 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIF6rnd060916 for ; Mon, 18 Dec 2006 15:06:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIF6qV6060913 for perforce@freebsd.org; Mon, 18 Dec 2006 15:06:52 GMT (envelope-from piso@freebsd.org) Date: Mon, 18 Dec 2006 15:06:52 GMT Message-Id: <200612181506.kBIF6qV6060913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 15:07:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=111898 Change 111898 by piso@piso_newluxor on 2006/12/18 15:06:00 Add a remainder about particular stuff to test. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#12 edit Differences ... ==== //depot/projects/soc2006/intr_filter/notes#12 (text+ko) ==== @@ -81,4 +81,9 @@ Converted drivers: --bfe, em, re, aac, xl, iwi+-bfe, em, re, aac, xl, iwi + +To test (in particular): + +-ata-cbus, ata-pci, snd_gusc, snd_sbc, snd_csa, sparc64/fhc, sparc64/pci/psycho, + sparc64/sbus/sbus, scc, pccbb, pccard. From owner-p4-projects@FreeBSD.ORG Mon Dec 18 16:26:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C32616A47C; Mon, 18 Dec 2006 16:26:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5FF9016A417 for ; Mon, 18 Dec 2006 16:26:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C073343CA6 for ; Mon, 18 Dec 2006 16:26:39 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIGQWRr074775 for ; Mon, 18 Dec 2006 16:26:32 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIGQWDm074766 for perforce@freebsd.org; Mon, 18 Dec 2006 16:26:32 GMT (envelope-from piso@freebsd.org) Date: Mon, 18 Dec 2006 16:26:32 GMT Message-Id: <200612181626.kBIGQWDm074766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 16:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=111899 Change 111899 by piso@piso_newluxor on 2006/12/18 16:26:17 We cannot use filters in the ata subsystem, so put a check to verify the condition. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#5 (text+ko) ==== @@ -188,15 +188,16 @@ static int ata_cbus_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter __unused, driver_intr_t *intr, + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct ata_cbus_controller *controller = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; - /* - * XXX_FILTER this code doesn't take care of filters. - */ + if (filter != NULL) { + printf("ata-cbus.c: we cannot use a filter here\n"); + return (EINVAL); + } controller->interrupt[unit].function = intr; controller->interrupt[unit].argument = arg; *cookiep = controller; ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#4 (text+ko) ==== @@ -345,10 +345,11 @@ else { struct ata_pci_controller *controller = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; - - /* - * XXX_FILTER this code doesn't take care of filters. - */ + + if (filter != NULL) { + printf("ata-pci.c: we cannot use a filter here\n"); + return (EINVAL); + } controller->interrupt[unit].function = function; controller->interrupt[unit].argument = argument; *cookiep = controller; From owner-p4-projects@FreeBSD.ORG Mon Dec 18 18:59:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7605B16A4FD; Mon, 18 Dec 2006 18:59:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4FB8A16A4D4 for ; Mon, 18 Dec 2006 18:59:32 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FFEB43CEC for ; Mon, 18 Dec 2006 18:57:52 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBIIvkrV010027 for ; Mon, 18 Dec 2006 18:57:46 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIIvkPD010024 for perforce@freebsd.org; Mon, 18 Dec 2006 18:57:46 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 18 Dec 2006 18:57:46 GMT Message-Id: <200612181857.kBIIvkPD010024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 111907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2006 18:59:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111907 Change 111907 by gonzo@gonzo_hq on 2006/12/18 18:56:53 o Clean out pmap_pte_XXX bits checking macroses, use those presented in pte.h header file. o Brace sensitve section of pmap_protect with vm_page_lock_queues/vm_page_unlock_queues calls. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#18 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#18 (text+ko) ==== @@ -105,6 +105,7 @@ #include #include #include +#include #include #ifndef PMAP_SHPGPERPROC @@ -133,21 +134,9 @@ /* * Get PDEs and PTEs for user/kernel address space */ -#define pmap_pte_ro(pte) ((*(pte) & PG_RO) != 0) -#define pmap_pte_w(pte) ((*(pte) & PG_W) != 0) -#define pmap_pte_v(pte) ((*(pte) & PG_V) != 0) -#define pmap_pte_pa(pte) (MIPS_PTE_TO_PA(*(pte))) -#define pmap_pte_prot(pte) (*(pte) & PG_PROT) - -#define pmap_pte_set_prot(pte, v) ((*pte &= ~PG_PROT), (*pte |= (v))) - -/* - * Given a map and a machine independent protection code, - * convert to a mips protection code. - * - * XXX - */ -#define pte_prot(m, p) (0) +#define pmap_pte_pa(pte) (MIPS_PTE_TO_PA(*(pte))) +#define pmap_pte_prot(pte) (*(pte) & PG_PROT) +#define pmap_pte_set_prot(pte, v) ((*pte &= ~PG_PROT), (*pte |= (v))) /* * Return non-zero if this pmap is currently active @@ -210,6 +199,14 @@ vm_page_t mpte, vm_page_t m); /* + * Given a map and a machine independent protection code, + * convert to a mips protection code. + * + * XXX + */ +#define pte_prot(m, p) (0) + +/* * Routine: pmap_pte * Function: * Extract the page table entry associated with @@ -1117,7 +1114,7 @@ * If pte is invalid, skip this page */ pte = pmap_pte(pmap, sva); - if (!pmap_pte_v(pte)) { + if (!pte_valid(pte)) { sva += PAGE_SIZE; continue; } @@ -1125,6 +1122,8 @@ if (pmap_pte_prot(pte) != newprot) { pt_entry_t oldpte = *pte; vm_page_t m = NULL; + + vm_page_lock_queues(); if ((oldpte & PG_D) == 0) { m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); vm_page_flag_set(m, PG_REFERENCED); @@ -1139,6 +1138,7 @@ oldpte = (oldpte & ~PG_PROT) | newprot; *pte = oldpte; pmap_invalidate_page(pmap, sva); + vm_page_unlock_queues(); } sva += PAGE_SIZE; @@ -1498,7 +1498,7 @@ pv = npv) { pte = pmap_pte(pv->pv_pmap, pv->pv_va); - if (!pmap_pte_v(pte)) + if (!pte_valid(pte)) panic("pmap_remove_pages: page on pm_pvlist has no pte\n"); tpte = *pte; @@ -1541,6 +1541,9 @@ void pmap_page_protect(vm_page_t m, vm_prot_t prot) { + /* + * Consider only readonly case + */ if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { panic("pmap_page_protect unimplemented\n"); @@ -1729,7 +1732,7 @@ return 0; } - if (pmap_pte_v(pte)) { + if (pte_valid(pte)) { vm_page_t m; vm_offset_t pa; From owner-p4-projects@FreeBSD.ORG Tue Dec 19 00:05:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C5C016A417; Tue, 19 Dec 2006 00:05:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7378216A415 for ; Tue, 19 Dec 2006 00:05:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C264B43CA5 for ; Tue, 19 Dec 2006 00:05:15 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ05FVx083398 for ; Tue, 19 Dec 2006 00:05:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ05FbP083395 for perforce@freebsd.org; Tue, 19 Dec 2006 00:05:15 GMT (envelope-from piso@freebsd.org) Date: Tue, 19 Dec 2006 00:05:15 GMT Message-Id: <200612190005.kBJ05FbP083395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 00:05:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111913 Change 111913 by piso@piso_newluxor on 2006/12/19 00:05:02 Put a check about filters: if people really want to use filters on this hw, they'll have to modify the bridge driver in them. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#4 (text+ko) ==== @@ -424,18 +424,16 @@ sc_p scp = (sc_p)device_get_softc(dev); devclass_t devclass; + if (filter != NULL) { + printf("gusc.c: we cannot use a filter here\n"); + return (EINVAL); + } devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->midi_intr.intr = intr; scp->midi_intr.arg = arg; return 0; } else if (strcmp(devclass_get_name(devclass), "pcm") == 0) { - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->pcm_intr.intr = intr; scp->pcm_intr.arg = arg; return 0; ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#5 (text+ko) ==== @@ -503,13 +503,17 @@ static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter __unused, driver_intr_t *intr, + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; int i, ret; + if (filter != NULL) { + printf("sbc.c: we cannot use a filter here\n"); + return (EINVAL); + } sbc_lock(scp); i = 0; while (i < IRQ_MAX) { ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#4 (text+ko) ==== @@ -440,13 +440,17 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter __unused, driver_intr_t *intr, void *arg, + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp; csa_res *resp; struct sndcard_func *func; + if (filter != NULL) { + printf("ata-csa.c: we cannot use a filter here\n"); + return (EINVAL); + } scp = device_get_softc(bus); resp = &scp->res; @@ -460,17 +464,11 @@ switch (func->func) { case SCF_PCM: - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->pcmintr = intr; scp->pcmintr_arg = arg; break; case SCF_MIDI: - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->midiintr = intr; scp->midiintr_arg = arg; break; From owner-p4-projects@FreeBSD.ORG Tue Dec 19 00:06:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F4916A40F; Tue, 19 Dec 2006 00:06:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C47A316A403 for ; Tue, 19 Dec 2006 00:06:17 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7965A43C9F for ; Tue, 19 Dec 2006 00:06:17 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ06HDE083490 for ; Tue, 19 Dec 2006 00:06:17 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ06Ho2083479 for perforce@freebsd.org; Tue, 19 Dec 2006 00:06:17 GMT (envelope-from piso@freebsd.org) Date: Tue, 19 Dec 2006 00:06:17 GMT Message-Id: <200612190006.kBJ06Ho2083479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 00:06:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=111914 Change 111914 by piso@piso_newluxor on 2006/12/19 00:06:12 Teach pccard how to handle filters. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#4 (text+ko) ==== @@ -118,6 +118,7 @@ static int pccard_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); static void pccard_child_detached(device_t parent, device_t dev); +static int pccard_filter(void *arg); static void pccard_intr(void *arg); static int pccard_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, @@ -1173,8 +1174,8 @@ pccard_function_disable(pf); } -static void -pccard_intr(void *arg) +static int +pccard_filter(void *arg) { struct pccard_function *pf = (struct pccard_function*) arg; int reg; @@ -1204,8 +1205,21 @@ else doisr = 0; } - if (pf->intr_handler != NULL && doisr) - pf->intr_handler(pf->intr_handler_arg); + if (pf->intr_handler != NULL && doisr) { + if (pf->intr_filter != NULL) + return (pf->intr_filter(pf->intr_handler_arg)); + else + return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); + } + return (FILTER_STRAY); +} + +static void +pccard_intr(void *arg) +{ + struct pccard_function *pf = (struct pccard_function*) arg; + + pf->intr_handler(pf->intr_handler_arg); } static int @@ -1220,13 +1234,11 @@ if (pf->intr_handler != NULL) panic("Only one interrupt handler per function allowed"); - err = bus_generic_setup_intr(dev, child, irq, flags, filter, pccard_intr, + err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter, pccard_intr, pf, cookiep); if (err != 0) return (err); - /* - * XXX_FILTER this code doesn't take care of filters. - */ + pf->intr_filter = filter; pf->intr_handler = intr; pf->intr_handler_arg = arg; pf->intr_handler_cookie = *cookiep; ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#2 (text+ko) ==== @@ -112,6 +112,7 @@ bus_addr_t pf_mfc_iobase; bus_addr_t pf_mfc_iomax; int pf_flags; + driver_filter_t *intr_filter; driver_intr_t *intr_handler; void *intr_handler_arg; void *intr_handler_cookie; From owner-p4-projects@FreeBSD.ORG Tue Dec 19 00:18:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F83916A417; Tue, 19 Dec 2006 00:18:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFF1B16A412 for ; Tue, 19 Dec 2006 00:18:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA12E43CA2 for ; Tue, 19 Dec 2006 00:18:42 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ0IXnD085118 for ; Tue, 19 Dec 2006 00:18:33 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ0IX7m085115 for perforce@freebsd.org; Tue, 19 Dec 2006 00:18:33 GMT (envelope-from piso@freebsd.org) Date: Tue, 19 Dec 2006 00:18:33 GMT Message-Id: <200612190018.kBJ0IX7m085115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 00:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111915 Change 111915 by piso@piso_newluxor on 2006/12/19 00:17:39 Forgot to delete the comment. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#6 (text+ko) ==== @@ -525,9 +525,6 @@ i = 0; while ((ret == 0) && (i < INTR_MAX)) { if (ihl->intr[i] == NULL) { - /* - * XXX_FILTER this code doesn't take care of filters. - */ ihl->intr[i] = intr; ihl->intr_arg[i] = arg; *cookiep = &ihl->intr[i]; From owner-p4-projects@FreeBSD.ORG Tue Dec 19 04:11:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A987116A47B; Tue, 19 Dec 2006 04:11:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6918D16A403 for ; Tue, 19 Dec 2006 04:11:27 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC35F43C9F for ; Tue, 19 Dec 2006 04:11:26 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ4BQ0a009737 for ; Tue, 19 Dec 2006 04:11:26 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ4BOeV009703 for perforce@freebsd.org; Tue, 19 Dec 2006 04:11:24 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 04:11:24 GMT Message-Id: <200612190411.kBJ4BOeV009703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 04:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=111920 Change 111920 by mjacob@mjexp_6 on 2006/12/19 04:10:55 Wankatootl Fruitl! Pull the -current isp && mpt driver bundles into a RELENG_6 tree for integration testing. Affected files ... .. //depot/projects/mjexp_6/sys/dev/isp/isp.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_freebsd.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_freebsd.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_ioctl.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_library.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_library.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_pci.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_sbus.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_stds.h#1 add .. //depot/projects/mjexp_6/sys/dev/isp/isp_target.c#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_target.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/isp_tpublic.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/ispmbox.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/ispreg.h#2 edit .. //depot/projects/mjexp_6/sys/dev/isp/ispvar.h#2 edit .. //depot/projects/mjexp_6/sys/dev/ispfw/asm_2400.h#1 add .. //depot/projects/mjexp_6/sys/dev/ispfw/ispfw.c#2 edit .. //depot/projects/mjexp_6/sys/dev/mpt/mpt.c#2 edit .. //depot/projects/mjexp_6/sys/dev/mpt/mpt.h#2 edit .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_cam.c#2 edit .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_debug.c#2 edit .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_raid.c#2 edit Differences ... ==== //depot/projects/mjexp_6/sys/dev/isp/isp.c#2 (text+ko) ==== @@ -26,8 +26,9 @@ /* * Machine and OS Independent (well, as best as possible) - * code for the Qlogic ISP SCSI adapters. + * code for the Qlogic ISP SCSI and FC-SCSI adapters. */ + /* * Inspiration and ideas about this driver are from Erik Moe's Linux driver * (qlogicisp.c) and Dave Miller's SBus version of same (qlogicisp.c). Some @@ -60,30 +61,16 @@ */ #define MBOX_DELAY_COUNT 1000000 / 100 +#define ISP_MARK_PORTDB(a, b) \ + isp_prt(isp, ISP_LOGSANCFG, "line %d: markportdb", __LINE__); \ + isp_mark_portdb(a, b) /* * Local static data */ -static const char portshift[] = - "Target %d Loop ID 0x%x (Port 0x%x) => Loop 0x%x (Port 0x%x)"; -static const char portdup[] = - "Target %d duplicates Target %d- killing off both"; -static const char retained[] = - "Retaining Loop ID 0x%x for Target %d (Port 0x%x)"; -static const char lretained[] = - "Retained login of Target %d (Loop ID 0x%x) Port 0x%x"; -static const char plogout[] = - "Logging out Target %d at Loop ID 0x%x (Port 0x%x)"; -static const char plogierr[] = - "Command Error in PLOGI for Port 0x%x (0x%x)"; -static const char nopdb[] = - "Could not get PDB for Device @ Port 0x%x"; -static const char pdbmfail1[] = - "PDB Loop ID info for Device @ Port 0x%x does not match up (0x%x)"; -static const char pdbmfail2[] = - "PDB Port info for Device @ Port 0x%x does not match up (0x%x)"; -static const char ldumped[] = - "Target %d (Loop ID 0x%x) Port 0x%x dumped after login info mismatch"; +static const char fconf[] = + "PortDB[%d] changed:\n current =(0x%x@0x%06x 0x%08x%08x 0x%08x%08x)\n" + " database=(0x%x@0x%06x 0x%08x%08x 0x%08x%08x)"; static const char notresp[] = "Not RESPONSE in RESPONSE Queue (type 0x%x) @ idx %d (next %d) nlooked %d"; static const char xact1[] = @@ -95,9 +82,9 @@ static const char pskip[] = "SCSI phase skipped for target %d.%d.%d"; static const char topology[] = - "Loop ID %d, Port ID 0x%x, Loop State 0x%x, Topology '%s'"; -static const char swrej[] = - "Fabric Nameserver rejected %s (Reason=0x%x Expl=0x%x) for Port ID 0x%x"; + "HBA PortID 0x%06x N-Port Handle %d, Connection Topology '%s'"; +static const char ourwwn[] = + "HBA WWNN 0x%08x%08x HBA WWPN 0x%08x%08x"; static const char finmsg[] = "%d.%d.%d: FIN dl%d resid %d STS 0x%x SKEY %c XS_ERR=0x%x"; static const char sc0[] = @@ -115,38 +102,51 @@ */ static int isp_parse_async(ispsoftc_t *, uint16_t); static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, - uint16_t *); + uint32_t *); +static void +isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *, long *); static void -isp_parse_status(ispsoftc_t *, ispstatusreq_t *, XS_T *); +isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *, long *); static void isp_fastpost_complete(ispsoftc_t *, uint16_t); static int isp_mbox_continue(ispsoftc_t *); static void isp_scsi_init(ispsoftc_t *); static void isp_scsi_channel_init(ispsoftc_t *, int); static void isp_fibre_init(ispsoftc_t *); -static void isp_mark_getpdb_all(ispsoftc_t *); -static int isp_getmap(ispsoftc_t *, fcpos_map_t *); -static int isp_getpdb(ispsoftc_t *, int, isp_pdb_t *); +static void isp_fibre_init_2400(ispsoftc_t *); +static void isp_mark_portdb(ispsoftc_t *, int); +static int isp_plogx(ispsoftc_t *, uint16_t, uint32_t, int, int); +static int isp_port_login(ispsoftc_t *, uint16_t, uint32_t); +static int isp_port_logout(ispsoftc_t *, uint16_t, uint32_t); +static int isp_getpdb(ispsoftc_t *, uint16_t, isp_pdb_t *, int); static uint64_t isp_get_portname(ispsoftc_t *, int, int); static int isp_fclink_test(ispsoftc_t *, int); -static const char *isp2100_fw_statename(int); +static const char *ispfc_fw_statename(int); static int isp_pdb_sync(ispsoftc_t *); static int isp_scan_loop(ispsoftc_t *); -static int isp_fabric_mbox_cmd(ispsoftc_t *, mbreg_t *); -static int isp_scan_fabric(ispsoftc_t *, int); -static void isp_register_fc4_type(ispsoftc_t *); +static int isp_gid_ft_sns(ispsoftc_t *); +static int isp_gid_ft_ct_passthru(ispsoftc_t *); +static int isp_scan_fabric(ispsoftc_t *); +static int isp_login_device(ispsoftc_t *, uint32_t, isp_pdb_t *, uint16_t *); +static int isp_register_fc4_type(ispsoftc_t *); +static int isp_register_fc4_type_24xx(ispsoftc_t *); +static uint16_t isp_nxt_handle(ispsoftc_t *, uint16_t); static void isp_fw_state(ispsoftc_t *); static void isp_mboxcmd_qnw(ispsoftc_t *, mbreg_t *, int); -static void isp_mboxcmd(ispsoftc_t *, mbreg_t *, int); +static void isp_mboxcmd(ispsoftc_t *, mbreg_t *); static void isp_update(ispsoftc_t *); static void isp_update_bus(ispsoftc_t *, int); static void isp_setdfltparm(ispsoftc_t *, int); static int isp_read_nvram(ispsoftc_t *); +static int isp_read_nvram_2400(ispsoftc_t *); static void isp_rdnvram_word(ispsoftc_t *, int, uint16_t *); +static void isp_rd_2400_nvram(ispsoftc_t *, uint32_t, uint32_t *); static void isp_parse_nvram_1020(ispsoftc_t *, uint8_t *); static void isp_parse_nvram_1080(ispsoftc_t *, int, uint8_t *); static void isp_parse_nvram_12160(ispsoftc_t *, int, uint8_t *); +static void isp_fix_nvram_wwns(ispsoftc_t *); static void isp_parse_nvram_2100(ispsoftc_t *, uint8_t *); +static void isp_parse_nvram_2400(ispsoftc_t *, uint8_t *); /* * Reset Hardware. @@ -160,9 +160,10 @@ isp_reset(ispsoftc_t *isp) { mbreg_t mbs; - uint32_t code_org; + uint32_t code_org, val; int loops, i, dodnld = 1; - char *btype = "????"; + static const char *btype = "????"; + static const char dcrc[] = "Downloaded RISC Code Checksum Failure"; isp->isp_state = ISP_NILSTATE; @@ -202,10 +203,16 @@ /* * Just in case it was paused... */ - ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); + if (IS_24XX(isp)) { + ISP_WRITE(isp, BIU2400_HCCR, + HCCR_2400_CMD_RELEASE); + } else { + ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); + } MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_ABOUT_FIRMWARE; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { isp->isp_romfw_rev[0] = mbs.param[1]; isp->isp_romfw_rev[1] = mbs.param[2]; @@ -215,21 +222,51 @@ isp->isp_touched = 1; } - DISABLE_INTS(isp); + ISP_DISABLE_INTS(isp); + + /* + * Pick an initial maxcmds value which will be used + * to allocate xflist pointer space. It may be changed + * later by the firmware. + */ + if (IS_24XX(isp)) { + isp->isp_maxcmds = 4096; + } else if (IS_2322(isp)) { + isp->isp_maxcmds = 2048; + } else if (IS_23XX(isp) || IS_2200(isp)) { + isp->isp_maxcmds = 1024; + } else { + isp->isp_maxcmds = 512; + } + + /* + * Set up DMA for the request and result queues. + * + * We do this now so we can use the request queue + * for a dma + */ + if (ISP_MBOXDMASETUP(isp) != 0) { + isp_prt(isp, ISP_LOGERR, "Cannot setup DMA"); + return; + } + /* * Set up default request/response queue in-pointer/out-pointer * register indices. */ - if (IS_23XX(isp)) { + if (IS_24XX(isp)) { + isp->isp_rqstinrp = BIU2400_REQINP; + isp->isp_rqstoutrp = BIU2400_REQOUTP; + isp->isp_respinrp = BIU2400_RSPINP; + isp->isp_respoutrp = BIU2400_RSPOUTP; + isp->isp_atioinrp = BIU2400_ATIO_RSPINP; + isp->isp_atiooutrp = BIU2400_ATIO_REQINP; + } else if (IS_23XX(isp)) { isp->isp_rqstinrp = BIU_REQINP; isp->isp_rqstoutrp = BIU_REQOUTP; isp->isp_respinrp = BIU_RSPINP; isp->isp_respoutrp = BIU_RSPOUTP; - ISP_WRITE(isp, isp->isp_rqstinrp, 0); - ISP_WRITE(isp, isp->isp_rqstoutrp, 0); - ISP_WRITE(isp, isp->isp_respinrp, 0); - ISP_WRITE(isp, isp->isp_respoutrp, 0); } else { isp->isp_rqstinrp = INMAILBOX4; isp->isp_rqstoutrp = OUTMAILBOX4; @@ -241,7 +278,13 @@ * Put the board into PAUSE mode (so we can read the SXP registers * or write FPM/FBM registers). */ - ISP_WRITE(isp, HCCR, HCCR_CMD_PAUSE); + if (IS_24XX(isp)) { + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_HOST_INT); + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_RISC_INT); + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_PAUSE); + } else { + ISP_WRITE(isp, HCCR, HCCR_CMD_PAUSE); + } if (IS_FC(isp)) { switch (isp->isp_type) { @@ -260,20 +303,24 @@ case ISP_HA_FC_2322: btype = "2322"; break; - case ISP_HA_FC_2422: + case ISP_HA_FC_2400: btype = "2422"; break; default: break; } - /* - * While we're paused, reset the FPM module and FBM fifos. - */ - ISP_WRITE(isp, BIU2100_CSR, BIU2100_FPM0_REGS); - ISP_WRITE(isp, FPM_DIAG_CONFIG, FPM_SOFT_RESET); - ISP_WRITE(isp, BIU2100_CSR, BIU2100_FB_REGS); - ISP_WRITE(isp, FBM_CMD, FBMCMD_FIFO_RESET_ALL); - ISP_WRITE(isp, BIU2100_CSR, BIU2100_RISC_REGS); + + if (!IS_24XX(isp)) { + /* + * While we're paused, reset the FPM module and FBM + * fifos. + */ + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FPM0_REGS); + ISP_WRITE(isp, FPM_DIAG_CONFIG, FPM_SOFT_RESET); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FB_REGS); + ISP_WRITE(isp, FBM_CMD, FBMCMD_FIFO_RESET_ALL); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_RISC_REGS); + } } else if (IS_1240(isp)) { sdparam *sdp = isp->isp_param; btype = "1240"; @@ -443,8 +490,6 @@ */ ISP_RESET0(isp); -again: - /* * Hit the chip over the head with hammer, * and give the ISP a chance to recover. @@ -466,6 +511,44 @@ DMA_CNTRL_CLEAR_CHAN | DMA_CNTRL_RESET_INT); + } else if (IS_24XX(isp)) { + /* + * Stop DMA and wait for it to stop. + */ + ISP_WRITE(isp, BIU2400_CSR, BIU2400_DMA_STOP|(3 << 4)); + for (val = loops = 0; loops < 30000; loops++) { + USEC_DELAY(10); + val = ISP_READ(isp, BIU2400_CSR); + if ((val & BIU2400_DMA_ACTIVE) == 0) { + break; + } + } + if (val & BIU2400_DMA_ACTIVE) { + ISP_RESET0(isp); + isp_prt(isp, ISP_LOGERR, "DMA Failed to Stop on Reset"); + return; + } + /* + * Hold it in SOFT_RESET and STOP state for 100us. + */ + ISP_WRITE(isp, BIU2400_CSR, + BIU2400_SOFT_RESET|BIU2400_DMA_STOP|(3 << 4)); + USEC_DELAY(100); + for (loops = 0; loops < 10000; loops++) { + USEC_DELAY(5); + val = ISP_READ(isp, OUTMAILBOX0); + } + for (val = loops = 0; loops < 500000; loops ++) { + val = ISP_READ(isp, BIU2400_CSR); + if ((val & BIU2400_SOFT_RESET) == 0) { + break; + } + } + if (val & BIU2400_SOFT_RESET) { + ISP_RESET0(isp); + isp_prt(isp, ISP_LOGERR, "Failed to come out of reset"); + return; + } } else { ISP_WRITE(isp, BIU2100_CSR, BIU2100_SOFT_RESET); /* @@ -490,8 +573,13 @@ loops = MBOX_DELAY_COUNT; for (;;) { if (IS_SCSI(isp)) { - if (!(ISP_READ(isp, BIU_ICR) & BIU_ICR_SOFT_RESET)) + if (!(ISP_READ(isp, BIU_ICR) & BIU_ICR_SOFT_RESET)) { + break; + } + } else if (IS_24XX(isp)) { + if (ISP_READ(isp, OUTMAILBOX0) == 0) { break; + } } else { if (!(ISP_READ(isp, BIU2100_CSR) & BIU2100_SOFT_RESET)) break; @@ -499,6 +587,7 @@ USEC_DELAY(100); if (--loops < 0) { ISP_DUMPREGS(isp, "chip reset timed out"); + ISP_RESET0(isp); return; } } @@ -510,24 +599,41 @@ if (IS_SCSI(isp)) { ISP_WRITE(isp, BIU_CONF1, 0); - } else { + } else if (!IS_24XX(isp)) { ISP_WRITE(isp, BIU2100_CSR, 0); } /* * Reset RISC Processor */ - ISP_WRITE(isp, HCCR, HCCR_CMD_RESET); - USEC_DELAY(100); - /* Clear semaphore register (just to be sure) */ - ISP_WRITE(isp, BIU_SEMA, 0); + if (IS_24XX(isp)) { + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_RESET); + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_RELEASE); + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_RESET); + } else { + ISP_WRITE(isp, HCCR, HCCR_CMD_RESET); + USEC_DELAY(100); + ISP_WRITE(isp, BIU_SEMA, 0); + } + /* - * Establish some initial burst rate stuff. - * (only for the 1XX0 boards). This really should - * be done later after fetching from NVRAM. + * Post-RISC Reset stuff. */ - if (IS_SCSI(isp)) { + if (IS_24XX(isp)) { + for (val = loops = 0; loops < 5000000; loops++) { + USEC_DELAY(5); + val = ISP_READ(isp, OUTMAILBOX0); + if (val == 0) { + break; + } + } + if (val != 0) { + ISP_RESET0(isp); + isp_prt(isp, ISP_LOGERR, "reset didn't clear"); + return; + } + } else if (IS_SCSI(isp)) { uint16_t tmp = isp->isp_mdvec->dv_conf1; /* * Busted FIFO. Turn off all but burst enables. @@ -540,15 +646,36 @@ ISP_SETBITS(isp, CDMA_CONF, DMA_ENABLE_BURST); ISP_SETBITS(isp, DDMA_CONF, DMA_ENABLE_BURST); } - ISP_WRITE(isp, RISC_MTR, 0x1212); + if (SDPARAM(isp)->isp_ptisp) { + if (SDPARAM(isp)->isp_ultramode) { + while (ISP_READ(isp, RISC_MTR) != 0x1313) { + ISP_WRITE(isp, RISC_MTR, 0x1313); + ISP_WRITE(isp, HCCR, HCCR_CMD_STEP); + } + } else { + ISP_WRITE(isp, RISC_MTR, 0x1212); + } + /* + * PTI specific register + */ + ISP_WRITE(isp, RISC_EMB, DUAL_BANK); + } else { + ISP_WRITE(isp, RISC_MTR, 0x1212); + } + ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); } else { ISP_WRITE(isp, RISC_MTR2100, 0x1212); if (IS_2200(isp) || IS_23XX(isp)) { ISP_WRITE(isp, HCCR, HCCR_2X00_DISABLE_PARITY_PAUSE); } + ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); } - ISP_WRITE(isp, HCCR, HCCR_CMD_RELEASE); /* release paused processor */ + ISP_WRITE(isp, isp->isp_rqstinrp, 0); + ISP_WRITE(isp, isp->isp_rqstoutrp, 0); + ISP_WRITE(isp, isp->isp_respinrp, 0); + ISP_WRITE(isp, isp->isp_respoutrp, 0); + /* * Do MD specific post initialization @@ -561,13 +688,14 @@ * Avoid doing this on the 2312 because you can generate a PCI * parity error (chip breakage). */ - if (IS_23XX(isp)) { - USEC_DELAY(5); + if (IS_2312(isp)) { + USEC_DELAY(100); } else { loops = MBOX_DELAY_COUNT; while (ISP_READ(isp, OUTMAILBOX0) == MBOX_BUSY) { USEC_DELAY(100); if (--loops < 0) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "MBOX_BUSY never cleared on reset"); return; @@ -586,12 +714,14 @@ */ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_NO_OP; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } - if (IS_SCSI(isp)) { + if (IS_SCSI(isp) || IS_24XX(isp)) { MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_MAILBOX_REG_TEST; mbs.param[1] = 0xdead; @@ -599,13 +729,18 @@ mbs.param[3] = 0xffff; mbs.param[4] = 0x1111; mbs.param[5] = 0xa5a5; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.param[6] = 0x0000; + mbs.param[7] = 0x0000; + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); return; } if (mbs.param[1] != 0xdead || mbs.param[2] != 0xbeef || mbs.param[3] != 0xffff || mbs.param[4] != 0x1111 || mbs.param[5] != 0xa5a5) { + ISP_RESET0(isp); isp_prt(isp, ISP_LOGERR, "Register Test Failed (0x%x 0x%x 0x%x 0x%x 0x%x)", mbs.param[1], mbs.param[2], mbs.param[3], @@ -629,12 +764,173 @@ dodnld = 0; } - if (IS_23XX(isp)) { + if (IS_24XX(isp)) { + code_org = ISP_CODE_ORG_2400; + } else if (IS_23XX(isp)) { code_org = ISP_CODE_ORG_2300; } else { code_org = ISP_CODE_ORG; } - if (dodnld) { + + if (dodnld && IS_24XX(isp)) { + uint32_t *ptr = isp->isp_mdvec->dv_ispfw; + + /* + * NB: Whatever you do do, do *not* issue the VERIFY FIRMWARE + * NB: command to the 2400 while loading new firmware. This + * NB: causes the new f/w to start and immediately crash back + * NB: to the ROM. + */ + + /* + * Keep loading until we run out of f/w. + */ + code_org = ptr[2]; /* 1st load address is our start addr */ + + for (;;) { + uint32_t la, wi, wl; + + isp_prt(isp, ISP_LOGDEBUG0, + "load 0x%x words of code at load address 0x%x", + ptr[3], ptr[2]); + + wi = 0; + la = ptr[2]; + wl = ptr[3]; + + while (wi < ptr[3]) { + uint32_t *cp; + uint32_t nw; + + nw = ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)) >> 2; + if (nw > wl) { + nw = wl; + } + cp = isp->isp_rquest; + for (i = 0; i < nw; i++) { + cp[i] = ptr[wi++]; + wl--; + } + MEMORYBARRIER(isp, SYNC_REQUEST, + 0, ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp))); + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_LOAD_RISC_RAM; + mbs.param[1] = la; + mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); + mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); + mbs.param[4] = nw >> 16; + mbs.param[5] = nw; + mbs.param[6] = DMA_WD3(isp->isp_rquest_dma); + mbs.param[7] = DMA_WD2(isp->isp_rquest_dma); + mbs.param[8] = la >> 16; + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, + "F/W Risc Ram Load Failed"); + ISP_RESET0(isp); + return; + } + la += nw; + } + + if (ptr[1] == 0) { + break; + } + ptr += ptr[3]; + } + isp->isp_loaded_fw = 1; + } else if (dodnld && IS_23XX(isp)) { + uint16_t *ptr = isp->isp_mdvec->dv_ispfw; + uint16_t wi, wl, segno; + uint32_t la; + + la = code_org; + segno = 0; + + for (;;) { + uint32_t nxtaddr; + + isp_prt(isp, ISP_LOGDEBUG0, + "load 0x%x words of code at load address 0x%x", + ptr[3], la); + + wi = 0; + wl = ptr[3]; + + while (wi < ptr[3]) { + uint16_t *cp; + uint32_t nw; + + nw = ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)) >> 1; + if (nw > wl) { + nw = wl; + } + if (nw > (1 << 15)) { + nw = 1 << 15; + } + cp = isp->isp_rquest; + for (i = 0; i < nw; i++) { + cp[i] = ptr[wi++]; + wl--; + } + MEMORYBARRIER(isp, SYNC_REQUEST, + 0, ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp))); + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_LOAD_RISC_RAM; + mbs.param[1] = la; + mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); + mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); + mbs.param[4] = nw; + mbs.param[6] = DMA_WD3(isp->isp_rquest_dma); + mbs.param[7] = DMA_WD2(isp->isp_rquest_dma); + mbs.param[8] = la >> 16; + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, + "F/W Risc Ram Load Failed"); + ISP_RESET0(isp); + return; + } + la += nw; + } + + if (!IS_2322(isp)) { + /* + * Verify that it downloaded correctly. + */ + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_VERIFY_CHECKSUM; + mbs.param[1] = code_org; + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, dcrc); + ISP_RESET0(isp); + return; + } + break; + } + + if (++segno == 3) { + break; + } + + /* + * If we're a 2322, the firmware actually comes in + * three chunks. We loaded the first at the code_org + * address. The other two chunks, which follow right + * after each other in memory here, get loaded at + * addresses specfied at offset 0x9..0xB. + */ + + nxtaddr = ptr[3]; + ptr = &ptr[nxtaddr]; + la = ptr[5] | ((ptr[4] & 0x3f) << 16); + } + isp->isp_loaded_fw = 1; + } else if (dodnld) { uint16_t *ptr = isp->isp_mdvec->dv_ispfw; isp->isp_mbxworkp = &ptr[1]; @@ -644,76 +940,27 @@ mbs.param[0] = MBOX_WRITE_RAM_WORD; mbs.param[1] = code_org; mbs.param[2] = ptr[0]; - isp_mboxcmd(isp, &mbs, MBLOGNONE); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "F/W download failed at word %d", isp->isp_mbxwrk1 - code_org); - dodnld = 0; - goto again; + ISP_RESET0(isp); + return; } - /* - * If we're a 2322, the firmware actually comes in three chunks. - * We loaded the first at the code_org address. The other two - * chunks, which follow right after each other in memory here, - * get loaded at addresses specfied at offset 0x9..0xB. + * Verify that it downloaded correctly. */ - if (IS_2322(isp)) { - uint32_t nxtaddr; - uint32_t offset; - - nxtaddr = ptr[3]; - ptr = &ptr[nxtaddr]; - offset = ptr[5] | (((uint32_t)(ptr[4] & 0x3f)) << 16); - isp->isp_mbxworkp = &ptr[1]; - isp->isp_mbxwrk0 = ptr[3] - 1; - isp->isp_mbxwrk1 = offset + 1; - isp->isp_mbxwrk8 = (offset + 1) >> 16; - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_WRITE_RAM_WORD_EXTENDED; - mbs.param[1] = offset; - mbs.param[2] = ptr[0]; - mbs.param[8] = offset >> 16; - isp_mboxcmd(isp, &mbs, MBLOGNONE); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, - "Receive Sequencer F/W Load Failed"); - return; - } - - nxtaddr = ptr[3]; - ptr = &ptr[nxtaddr]; - offset = ptr[5] | (((uint32_t)(ptr[4] & 0x3f)) << 16); - isp->isp_mbxworkp = &ptr[1]; - isp->isp_mbxwrk0 = ptr[3] - 1; - isp->isp_mbxwrk1 = (offset + 1); - isp->isp_mbxwrk8 = (offset + 1) >> 16; - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_WRITE_RAM_WORD_EXTENDED; - mbs.param[1] = offset; - mbs.param[2] = ptr[0]; - mbs.param[8] = offset >> 16; - isp_mboxcmd(isp, &mbs, MBLOGNONE); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, - "Transmit Sequencer F/W Load Failed"); - return; - } - } else { - /* - * Verify that it downloaded correctly. - */ - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_VERIFY_CHECKSUM; - mbs.param[1] = code_org; - isp_mboxcmd(isp, &mbs, MBLOGNONE); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, - "Downloaded RISC Code Checksum Failure"); - return; - } - + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_VERIFY_CHECKSUM; + mbs.param[1] = code_org; + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, dcrc); + ISP_RESET0(isp); + return; } isp->isp_loaded_fw = 1; } else { @@ -730,28 +977,40 @@ MEMZERO(&mbs, sizeof (mbs)); + mbs.timeout = 1000000; mbs.param[0] = MBOX_EXEC_FIRMWARE; - mbs.param[1] = code_org; - if (IS_2322(isp) || IS_24XX(isp)) { + if (IS_24XX(isp)) { + mbs.param[1] = code_org >> 16; + mbs.param[2] = code_org; + if (isp->isp_loaded_fw) { + mbs.param[3] = 0; + } else { + mbs.param[3] = 1; + } + } else if (IS_2322(isp)) { + mbs.param[1] = code_org; if (isp->isp_loaded_fw) { mbs.param[2] = 0; } else { mbs.param[2] = 1; } + } else { + mbs.param[1] = code_org; } - isp_mboxcmd(isp, &mbs, MBLOGNONE); + + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (IS_2322(isp) || IS_24XX(isp)) { if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, "EXEC F/W failed: 0x%x", - mbs.param[0]); + ISP_RESET0(isp); return; } } /* - * Give it a chance to start. + * Give it a chance to finish starting up. */ - USEC_DELAY(500); + USEC_DELAY(250000); if (IS_SCSI(isp)) { /* @@ -760,15 +1019,24 @@ if (isp->isp_clock) { mbs.param[0] = MBOX_SET_CLOCK_RATE; mbs.param[1] = isp->isp_clock; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGNONE; + isp_mboxcmd(isp, &mbs); /* we will try not to care if this fails */ } } MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_ABOUT_FIRMWARE; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); + return; + } + + if (IS_24XX(isp) && mbs.param[1] == 0xdead) { + isp_prt(isp, ISP_LOGERR, "f/w didn't *really* start"); + ISP_RESET0(isp); return; } @@ -794,7 +1062,7 @@ isp->isp_fwrev[2] = mbs.param[3]; } - isp_prt(isp, ISP_LOGCONFIG, + isp_prt(isp, ISP_LOGALL, "Board Type %s, Chip Revision 0x%x, %s F/W Revision %d.%d.%d", btype, isp->isp_revision, dodnld? "loaded" : "resident", isp->isp_fwrev[0], isp->isp_fwrev[1], isp->isp_fwrev[2]); @@ -805,9 +1073,9 @@ * than 1.17.0, unless it's the firmware we specifically * are loading. * - * Note that all 22XX and 23XX f/w is greater than 1.X.0. + * Note that all 22XX and later f/w is greater than 1.X.0. */ - if (!(ISP_FW_NEWER_THAN(isp, 1, 17, 0))) { + if ((ISP_FW_OLDER_THAN(isp, 1, 17, 1))) { #ifdef USE_SMALLER_2100_FIRMWARE FCPARAM(isp)->isp_fwattr = ISP_FW_ATTR_SCCLUN; #else @@ -818,7 +1086,26 @@ isp_prt(isp, ISP_LOGDEBUG0, "Firmware Attributes = 0x%x", mbs.param[6]); } - if (IS_2KLOGIN(isp)) { + FCPARAM(isp)->isp_2klogin = 0; + FCPARAM(isp)->isp_sccfw = 0; + FCPARAM(isp)->isp_tmode = 0; + if (IS_24XX(isp)) { + FCPARAM(isp)->isp_2klogin = 1; + FCPARAM(isp)->isp_sccfw = 1; + FCPARAM(isp)->isp_tmode = 1; + } else { + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { + FCPARAM(isp)->isp_sccfw = 1; + } + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_2KLOGINS) { + FCPARAM(isp)->isp_2klogin = 1; + FCPARAM(isp)->isp_sccfw = 1; + } + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_TMODE) { + FCPARAM(isp)->isp_tmode = 1; + } + } + if (FCPARAM(isp)->isp_2klogin) { isp_prt(isp, ISP_LOGCONFIG, "2K Logins Supported"); } } @@ -830,24 +1117,23 @@ isp->isp_romfw_rev[2]); } - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_GET_FIRMWARE_STATUS; - isp_mboxcmd(isp, &mbs, MBLOGALL); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - return; + if (!IS_24XX(isp)) { + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_GET_FIRMWARE_STATUS; + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + ISP_RESET0(isp); + return; + } + if (isp->isp_maxcmds >= mbs.param[2]) { + isp->isp_maxcmds = mbs.param[2]; + } } - isp->isp_maxcmds = mbs.param[2]; - isp_prt(isp, ISP_LOGINFO, - "%d max I/O commands supported", mbs.param[2]); + isp_prt(isp, ISP_LOGCONFIG, + "%d max I/O command limit set", isp->isp_maxcmds); isp_fw_state(isp); - /* - * Set up DMA for the request and result mailboxes. - */ - if (ISP_MBOXDMASETUP(isp) != 0) { - isp_prt(isp, ISP_LOGERR, "Cannot setup DMA"); - return; - } isp->isp_state = ISP_RESETSTATE; /* @@ -878,7 +1164,7 @@ isp->isp_maxluns = 8; } } else { - if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { + if (FCPARAM(isp)->isp_sccfw) { isp->isp_maxluns = 16384; } else { isp->isp_maxluns = 16; @@ -902,8 +1188,22 @@ if (IS_DUALBUS(isp)) { isp_setdfltparm(isp, 1); } + if (IS_FC(isp)) { - isp_fibre_init(isp); + /* + * Do this *before* initializing the firmware. + */ + ISP_MARK_PORTDB(isp, 0); + FCPARAM(isp)->isp_fwstate = FW_CONFIG_WAIT; + FCPARAM(isp)->isp_loopstate = LOOP_NIL; + + if (isp->isp_role != ISP_ROLE_NONE) { + if (IS_24XX(isp)) { + isp_fibre_init_2400(isp); + } else { + isp_fibre_init(isp); + } + } } else { isp_scsi_init(isp); } @@ -947,8 +1247,8 @@ mbs.param[2] = sdp_chan0->isp_retry_delay; mbs.param[6] = sdp_chan1->isp_retry_count; mbs.param[7] = sdp_chan1->isp_retry_delay; - - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; } @@ -960,7 +1260,8 @@ mbs.param[0] = MBOX_SET_ASYNC_DATA_SETUP_TIME; mbs.param[1] = sdp_chan0->isp_async_data_setup; mbs.param[2] = sdp_chan1->isp_async_data_setup; - isp_mboxcmd(isp, &mbs, MBLOGALL); + mbs.logval = MBLOGALL; + isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 19 04:23:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3352016A415; Tue, 19 Dec 2006 04:23:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E97AA16A40F for ; Tue, 19 Dec 2006 04:23:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B36D243CA0 for ; Tue, 19 Dec 2006 04:23:52 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ4NguS012046 for ; Tue, 19 Dec 2006 04:23:42 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ4NgJ1012043 for perforce@freebsd.org; Tue, 19 Dec 2006 04:23:42 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 04:23:42 GMT Message-Id: <200612190423.kBJ4NgJ1012043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 04:23:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111921 Change 111921 by mjacob@mjexp_6 on 2006/12/19 04:23:02 Pull toy multipath into the RELENG_6 test fray. Affected files ... .. //depot/projects/mjexp_6/sbin/geom/class/multipath/Makefile#1 branch .. //depot/projects/mjexp_6/sbin/geom/class/multipath/geom_multipath.c#1 branch .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/mjexp_6/sys/modules/geom/Makefile#2 edit .. //depot/projects/mjexp_6/sys/modules/geom/geom_multipath/Makefile#1 branch Differences ... ==== //depot/projects/mjexp_6/sys/modules/geom/Makefile#2 (text+ko) ==== @@ -12,6 +12,7 @@ geom_label \ geom_mbr \ geom_mirror \ + geom_multipath \ geom_nop \ geom_pc98 \ geom_raid3 \ From owner-p4-projects@FreeBSD.ORG Tue Dec 19 04:29:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B4A416A416; Tue, 19 Dec 2006 04:29:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20C7216A407 for ; Tue, 19 Dec 2006 04:29:58 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFDD043C9F for ; Tue, 19 Dec 2006 04:29:57 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ4ToQC012289 for ; Tue, 19 Dec 2006 04:29:50 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ4ToCo012286 for perforce@freebsd.org; Tue, 19 Dec 2006 04:29:50 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 04:29:50 GMT Message-Id: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 04:29:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=111922 Change 111922 by mjacob@mjexp_6 on 2006/12/19 04:29:03 Fix !($*(@$*@($* intmax goop (or lack thereof in RELENG_6). Affected files ... .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 edit Differences ... ==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 (text+ko) ==== @@ -560,9 +560,15 @@ return; } if (pp0->mediasize != pp1->mediasize) { - gctl_error(req, "Provider %s has mediasize %zu; Provider %s " - "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize, +#if __FreeBSD_version < 700000 + gctl_error(req, "Provider %s is %llu; Provider %s is %llu", + pp0->name, (unsigned long long) pp0->mediasize, + pp1->name, (unsigned long long) pp1->mediasize); +#else + gctl_error(req, "Provider %s is %zu; Provider %s is %zu", + pp0->name, (intmax_t) pp0->mediasize, pp1->name, (intmax_t) pp1->mediasize); +#endif return; } if (pp0->sectorsize != pp1->sectorsize) { From owner-p4-projects@FreeBSD.ORG Tue Dec 19 05:12:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D1D16A407; Tue, 19 Dec 2006 05:12:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C744C16A40F; Tue, 19 Dec 2006 05:12:36 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (grnl-static-02-0046.dsl.iowatelecom.net [69.66.56.110]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E1AC43CA2; Tue, 19 Dec 2006 05:11:06 +0000 (GMT) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.13.8/8.13.8) with ESMTP id kBJ4aeeY092139; Mon, 18 Dec 2006 22:36:40 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.13.8/8.13.8/Submit) id kBJ4ae2r092138; Mon, 18 Dec 2006 22:36:40 -0600 (CST) (envelope-from brooks) Date: Mon, 18 Dec 2006 22:36:40 -0600 From: Brooks Davis To: Matt Jacob Message-ID: <20061219043640.GA92004@lor.one-eyed-alien.net> References: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2oS5YaxWCcQjTEyO" Content-Disposition: inline In-Reply-To: <200612190429.kBJ4ToCo012286@repoman.freebsd.org> User-Agent: Mutt/1.5.11 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 111922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 05:12:37 -0000 --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 19, 2006 at 04:29:50AM +0000, Matt Jacob wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D111922 >=20 > Change 111922 by mjacob@mjexp_6 on 2006/12/19 04:29:03 >=20 > Fix !($*(@$*@($* intmax goop (or lack thereof in RELENG_6). >=20 > Affected files ... >=20 > .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 = (text+ko) =3D=3D=3D=3D >=20 > @@ -560,9 +560,15 @@ > return; > } > if (pp0->mediasize !=3D pp1->mediasize) { > - gctl_error(req, "Provider %s has mediasize %zu; Provider %s " > - "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize, > +#if __FreeBSD_version < 700000 > + gctl_error(req, "Provider %s is %llu; Provider %s is %llu", > + pp0->name, (unsigned long long) pp0->mediasize, > + pp1->name, (unsigned long long) pp1->mediasize); > +#else > + gctl_error(req, "Provider %s is %zu; Provider %s is %zu", > + pp0->name, (intmax_t) pp0->mediasize, > pp1->name, (intmax_t) pp1->mediasize); > +#endif > return; > } > if (pp0->sectorsize !=3D pp1->sectorsize) { >=20 I'm pretty sure this isn't right and you're seeing something else. intmax_t has been around in the tree since at least 2002. It is the case that %zu is the wrong format for intmax_t. 'z' is the size_t modifier. For intmax_t you want 'j' instead. -- Brooks --2oS5YaxWCcQjTEyO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFFh2xYXY6L6fI4GtQRAuGFAJ0eIYUj4vgXAhPFzclZ4Wr8w9DpwACgjNZc jlFw1EhJGhCn9KOAHn5BDUg= =zQpb -----END PGP SIGNATURE----- --2oS5YaxWCcQjTEyO-- From owner-p4-projects@FreeBSD.ORG Tue Dec 19 06:42:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9DC316A412; Tue, 19 Dec 2006 06:42:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 81C9C16A407 for ; Tue, 19 Dec 2006 06:42:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 342F243CA2 for ; Tue, 19 Dec 2006 06:42:41 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ6gZbp045033 for ; Tue, 19 Dec 2006 06:42:35 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6gZRi045029 for perforce@freebsd.org; Tue, 19 Dec 2006 06:42:35 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 06:42:35 GMT Message-Id: <200612190642.kBJ6gZRi045029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 06:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=111923 Change 111923 by mjacob@mjexp on 2006/12/19 06:42:23 Don't attempt NULL g_access actions when adding a device. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#6 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#6 (text+ko) ==== @@ -280,7 +280,7 @@ /* * Set access permissions on new consumer to match other consumers */ - if (nxtcp) { + if (nxtcp && (nxtcp->acr + nxtcp->acw + nxtcp->ace)) { error = g_access(cp, nxtcp->acr, nxtcp->acw, nxtcp->ace); if (error) { printf("GEOM_MULTIPATH: cannot set access in " From owner-p4-projects@FreeBSD.ORG Tue Dec 19 06:43:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D06216A4AB; Tue, 19 Dec 2006 06:43:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B9BC916A494 for ; Tue, 19 Dec 2006 06:43:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DFF043CA4 for ; Tue, 19 Dec 2006 06:43:41 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ6hbN2045352 for ; Tue, 19 Dec 2006 06:43:37 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6hbhF045347 for perforce@freebsd.org; Tue, 19 Dec 2006 06:43:37 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 06:43:37 GMT Message-Id: <200612190643.kBJ6hbhF045347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 06:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=111924 Change 111924 by mjacob@mjexp on 2006/12/19 06:43:17 Hmm. If we find RISC paused in a 23XX interrupt, clear interrupt enables. The one or two times I've ever seen this, we got completely stuck on it. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#5 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#5 (text+ko) ==== @@ -1372,8 +1372,9 @@ if (hccr & HCCR_PAUSE) { ISP_WRITE(isp, HCCR, HCCR_RESET); isp_prt(isp, ISP_LOGERR, - "RISC paused at interrupt (%x->%x\n", hccr, + "RISC paused at interrupt (%x->%x)", hccr, ISP_READ(isp, HCCR)); + ISP_WRITE(isp, BIU_ICR, 0); } else { isp_prt(isp, ISP_LOGERR, "unknown interrupt 0x%x\n", r2hisr); From owner-p4-projects@FreeBSD.ORG Tue Dec 19 06:48:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C32316A47B; Tue, 19 Dec 2006 06:48:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 406BF16A40F for ; Tue, 19 Dec 2006 06:48:53 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EFAB43CBA for ; Tue, 19 Dec 2006 06:48:47 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ6mijb045693 for ; Tue, 19 Dec 2006 06:48:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6mhXV045690 for perforce@freebsd.org; Tue, 19 Dec 2006 06:48:43 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 06:48:43 GMT Message-Id: <200612190648.kBJ6mhXV045690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 06:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111925 Change 111925 by mjacob@mjexp on 2006/12/19 06:48:09 Merge from mjexp_6. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#7 integrate Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#7 (text+ko) ==== @@ -560,9 +560,15 @@ return; } if (pp0->mediasize != pp1->mediasize) { - gctl_error(req, "Provider %s has mediasize %zu; Provider %s " - "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize, +#if __FreeBSD_version < 700000 + gctl_error(req, "Provider %s is %llu; Provider %s is %llu", + pp0->name, (unsigned long long) pp0->mediasize, + pp1->name, (unsigned long long) pp1->mediasize); +#else + gctl_error(req, "Provider %s is %zu; Provider %s is %zu", + pp0->name, (intmax_t) pp0->mediasize, pp1->name, (intmax_t) pp1->mediasize); +#endif return; } if (pp0->sectorsize != pp1->sectorsize) { From owner-p4-projects@FreeBSD.ORG Tue Dec 19 06:49:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 090FE16A417; Tue, 19 Dec 2006 06:49:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DA7F816A412 for ; Tue, 19 Dec 2006 06:49:46 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1288F43CB4 for ; Tue, 19 Dec 2006 06:49:46 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ6njCG045812 for ; Tue, 19 Dec 2006 06:49:45 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6nj0l045809 for perforce@freebsd.org; Tue, 19 Dec 2006 06:49:45 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 06:49:45 GMT Message-Id: <200612190649.kBJ6nj0l045809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 06:49:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=111926 Change 111926 by mjacob@mjexp_6 on 2006/12/19 06:48:44 And merge back. Affected files ... .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#3 integrate Differences ... ==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#3 (text+ko) ==== @@ -280,7 +280,7 @@ /* * Set access permissions on new consumer to match other consumers */ - if (nxtcp) { + if (nxtcp && (nxtcp->acr + nxtcp->acw + nxtcp->ace)) { error = g_access(cp, nxtcp->acr, nxtcp->acw, nxtcp->ace); if (error) { printf("GEOM_MULTIPATH: cannot set access in " From owner-p4-projects@FreeBSD.ORG Tue Dec 19 07:40:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E95316A415; Tue, 19 Dec 2006 07:40:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E635516A412 for ; Tue, 19 Dec 2006 07:40:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5A4343CA3 for ; Tue, 19 Dec 2006 07:40:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ7eoix055573 for ; Tue, 19 Dec 2006 07:40:50 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7en3H055569 for perforce@freebsd.org; Tue, 19 Dec 2006 07:40:49 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Dec 2006 07:40:49 GMT Message-Id: <200612190740.kBJ7en3H055569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 07:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=111927 Change 111927 by imp@imp_lighthouse on 2006/12/19 07:39:51 Unwisely touch this file: add debugging code to gather more data on a condition I see far too often. I fear I'll have to implement COR reset to properly fix this. Basically, the firmware goes out to lunch, we set 'gone' but then bad things happen from there... Affected files ... .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/dev/wi/if_wi.c#10 (text+ko) ==== @@ -850,6 +850,7 @@ { struct wi_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; + int error; WI_LOCK(sc); @@ -858,7 +859,10 @@ ieee80211_new_state(ic, IEEE80211_S_INIT, -1); if (sc->sc_enabled && !sc->wi_gone) { CSR_WRITE_2(sc, WI_INT_EN, 0); - wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); + error = wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); + if (error) + printf("wi_stop's DISABLE returned %d disable %d\n", + error, disable); if (disable) { #ifdef __NetBSD__ if (sc->sc_disable) From owner-p4-projects@FreeBSD.ORG Tue Dec 19 07:41:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C32D16A40F; Tue, 19 Dec 2006 07:41:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6DA516A403 for ; Tue, 19 Dec 2006 07:41:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9268243CA2 for ; Tue, 19 Dec 2006 07:41:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ7fpP8056236 for ; Tue, 19 Dec 2006 07:41:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7fpqN056233 for perforce@freebsd.org; Tue, 19 Dec 2006 07:41:51 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Dec 2006 07:41:51 GMT Message-Id: <200612190741.kBJ7fpqN056233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 07:41:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111928 Change 111928 by imp@imp_lighthouse on 2006/12/19 07:41:07 Fix the argument to the read/write block routines so that iicbus_transfer_gen works again. Sam must not have tried to do iic things on his avila board since I 'fixed' this before... Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#5 (text+ko) ==== @@ -356,13 +356,16 @@ * buffer addresses. */ int -iicbus_transfer_gen(device_t bus, struct iic_msg *msgs, uint32_t nmsgs) +iicbus_transfer_gen(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) { - int i, error, max, lenread, lenwrote; + int i, error, lenread, lenwrote, nkid; + device_t *children, bus; - for (i = 0, max = 0; i < nmsgs; i++) - if (max < msgs[i].len) - max = msgs[i].len; + device_get_children(dev, &children, &nkid); + if (nkid != 1) + return EIO; + bus = children[0]; + free(children, M_TEMP); for (i = 0, error = 0; i < nmsgs && error == 0; i++) { if (msgs[i].flags & IIC_M_RD) error = iicbus_block_read(bus, msgs[i].slave, From owner-p4-projects@FreeBSD.ORG Tue Dec 19 07:45:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C75D16A40F; Tue, 19 Dec 2006 07:45:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 47F8816A403 for ; Tue, 19 Dec 2006 07:45:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBFDC43CA2 for ; Tue, 19 Dec 2006 07:45:00 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ7iukW056866 for ; Tue, 19 Dec 2006 07:44:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7iukl056863 for perforce@freebsd.org; Tue, 19 Dec 2006 07:44:56 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Dec 2006 07:44:56 GMT Message-Id: <200612190744.kBJ7iukl056863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 07:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=111929 Change 111929 by imp@imp_lighthouse on 2006/12/19 07:44:45 MF FreeBSD-tsc-6 Convert write to 7-1 addressing. Also, it turns out that my bitchin' iic controller was smart and would keep retrying until we'd succeed. This means that the delay caused by writes were getting obscured. Now we read back the first byte we've written. This gets the iic eeproms working on the hacked-up bit-bang driver that I wrote for AT91 in place of at91_twi. Turns out we'll likely not need it, but it was a good excersize none-the-less... Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/icee.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/icee.c#9 (text+ko) ==== @@ -214,11 +214,14 @@ icee_write(struct cdev *dev, struct uio *uio, int ioflag) { struct icee_softc *sc; - int error, len, slave; + int error, len, slave, waitlimit; uint8_t data[MAX_WR_SZ + 2]; - struct iic_msg msgs[1] = { + struct iic_msg wr[1] = { { 0, IIC_M_WR, 0, data }, }; + struct iic_msg rd[1] = { + { 0, IIC_M_RD, 1, data }, + }; sc = CDEV2SOFTC(dev); if (uio->uio_offset >= sc->size) @@ -234,24 +237,36 @@ uio->uio_resid); switch (sc->type) { case 8: - slave = (uio->uio_offset >> 8) | sc->addr; - msgs[0].len = 1 + len; + slave = (uio->uio_offset >> 7) | sc->addr; + wr[0].len = 1 + len; data[0] = uio->uio_offset & 0xff; break; case 16: - slave = sc->addr | (uio->uio_offset >> 16); - msgs[0].len = 2 + len; + slave = sc->addr | (uio->uio_offset >> 15); + wr[0].len = 2 + len; data[0] = (uio->uio_offset >> 8) & 0xff; data[1] = uio->uio_offset & 0xff; break; } - msgs[0].slave = slave; + wr[0].slave = slave; error = uiomove(data + sc->type / 8, len, uio); if (error) break; - error = iicbus_transfer(sc->sc_dev, msgs, 1); + error = iicbus_transfer(sc->sc_dev, wr, 1); if (error) break; + // Now wait for the write to be done by trying to read + // the part. + waitlimit = 10000; + rd[0].slave = slave; + do + { + error = iicbus_transfer(sc->sc_dev, rd, 1); + } while (waitlimit-- > 0 && error != 0); + if (error) { + printf("waiting for write failed %d\n", error); + break; + } } ICEE_UNLOCK(sc); return error; From owner-p4-projects@FreeBSD.ORG Tue Dec 19 07:51:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5C9416A416; Tue, 19 Dec 2006 07:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 995B116A40F for ; Tue, 19 Dec 2006 07:51:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59EB543CA3 for ; Tue, 19 Dec 2006 07:51:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ7p4aZ057295 for ; Tue, 19 Dec 2006 07:51:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7p4Tk057283 for perforce@freebsd.org; Tue, 19 Dec 2006 07:51:04 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Dec 2006 07:51:04 GMT Message-Id: <200612190751.kBJ7p4Tk057283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 07:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=111930 Change 111930 by imp@imp_lighthouse on 2006/12/19 07:50:08 Make this bad-boy work. o Eliminate the I2C_DELAY. bb driver does that so we don't need to. this doubles the performance to merely 5 times slower than the twi device. o Don't enable pullups for this device. Turns out that we already have them on the board.... o In setsda, use TWD rather than TWCK since SDA is for data... Submitted by: Bernd The Pointy Hat for Excessive Cut and paste goes to: imp Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_bbiic.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_bbiic.c#2 (text+ko) ==== @@ -48,8 +48,6 @@ #include "iicbb_if.h" -#define I2C_DELAY 10 - #define TWD AT91C_PIO_PA25 #define TWCK AT91C_PIO_PA26 #define PIO AT91RM92_PIOA_BASE @@ -73,7 +71,7 @@ sc->sc_dev = dev; at91_pio_use_gpio(PIO, TWD | TWCK); - at91_pio_gpio_output(PIO, TWD | TWCK, 1); + at91_pio_gpio_output(PIO, TWD | TWCK, 0); at91_pio_gpio_high_z(PIO, TWD | TWCK, 1); /* add generic bit-banging code */ if ((sc->iicbb = device_add_child(dev, "iicbb", -1)) == NULL) @@ -106,10 +104,9 @@ at91_bbiic_setsda(device_t dev, char val) { if (val) - at91_pio_gpio_set(PIO, TWCK); + at91_pio_gpio_set(PIO, TWD); else - at91_pio_gpio_clear(PIO, TWCK); - DELAY(I2C_DELAY); + at91_pio_gpio_clear(PIO, TWD); } static void @@ -119,7 +116,6 @@ at91_pio_gpio_set(PIO, TWCK); else at91_pio_gpio_clear(PIO, TWCK); - DELAY(I2C_DELAY); } static int From owner-p4-projects@FreeBSD.ORG Tue Dec 19 07:57:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0451716A415; Tue, 19 Dec 2006 07:57:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D334416A407 for ; Tue, 19 Dec 2006 07:57:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 865EF43C9F for ; Tue, 19 Dec 2006 07:57:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ7vCBa058573 for ; Tue, 19 Dec 2006 07:57:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7vCq3058570 for perforce@freebsd.org; Tue, 19 Dec 2006 07:57:12 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Dec 2006 07:57:12 GMT Message-Id: <200612190757.kBJ7vCq3058570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 07:57:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=111931 Change 111931 by imp@imp_lighthouse on 2006/12/19 07:57:09 Fix two major bugs, and a bunch of nits: o Eliminate an extra, redundant reading off the sr. o If we don't read enough bytes, don't pretend that we did. Instead, return an error. Maybe we should give an indication of how many bytes were read in this case, but for now we just return the error. o When we encounter an error, use the big hammer of software reset to fix. This may not be entirely necessary but seems to help solve problems we see when reading after there's been an error. o Return ENXIO for NACK. Lame error message, but follows existing practice. o Use #defines for clock speeds rather than hard coding numbers. # this makes it possible to read from existent and then non-existent # devices in a tight loop w/o occasional data corruption of many # flavors. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#40 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#40 (text+ko) ==== @@ -45,6 +45,10 @@ #include #include "iicbus_if.h" +#define TWI_SLOW_CLOCK 1500 +#define TWI_FAST_CLOCK 45000 +#define TWI_FASTEST_CLOCK 90000 + struct at91_twi_softc { device_t dev; /* Myself */ @@ -123,7 +127,7 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / TWI_FASTEST_CLOCK) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); @@ -232,7 +236,7 @@ if (counter <= 0) err = EBUSY; else if (sr & TWI_SR_NACK) - err = EADDRNOTAVAIL; + err = ENXIO; // iic nack convention return (err); } @@ -252,17 +256,17 @@ */ switch (speed) { case IIC_SLOW: - clk = 1500; + clk = TWI_SLOW_CLOCK; break; case IIC_FAST: - clk = 45000; + clk = TWI_FAST_CLOCK; break; case IIC_UNKNOWN: case IIC_FASTEST: default: - clk = 90000; + clk = TWI_FASTEST_CLOCK; break; } sc->cwgr = TWI_CWGR_CKDIV(1) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(clk)) | @@ -332,7 +336,6 @@ if (msgs[i].flags & IIC_M_RD) { sr = RD4(sc, TWI_SR); while (!(sr & TWI_SR_TXCOMP)) { - sr = RD4(sc, TWI_SR); if ((sr = RD4(sc, TWI_SR)) & TWI_SR_RXRDY) { len--; *buf++ = RD4(sc, TWI_RHR) & 0xff; @@ -340,8 +343,8 @@ WR4(sc, TWI_CR, TWI_CR_STOP); } } - if (sr & TWI_SR_NACK) { - err = EADDRNOTAVAIL; + if (len > 0 || (sr & TWI_SR_NACK)) { + err = ENXIO; // iic nack convention goto out; } } else { @@ -357,8 +360,11 @@ break; } out:; - if (err) - WR4(sc, TWI_CR, TWI_CR_STOP); + if (err) { + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); + } AT91_TWI_UNLOCK(sc); return (err); } From owner-p4-projects@FreeBSD.ORG Tue Dec 19 16:42:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73CE716A415; Tue, 19 Dec 2006 16:42:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3728516A407 for ; Tue, 19 Dec 2006 16:42:28 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 232C943CB5 for ; Tue, 19 Dec 2006 16:42:20 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJGgKXJ070753 for ; Tue, 19 Dec 2006 16:42:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJGgKRQ070747 for perforce@freebsd.org; Tue, 19 Dec 2006 16:42:20 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 16:42:20 GMT Message-Id: <200612191642.kBJGgKRQ070747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 16:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=111946 Change 111946 by mjacob@mjexp_6 on 2006/12/19 16:41:27 oops- add multipath Affected files ... .. //depot/projects/mjexp_6/sbin/geom/class/Makefile#2 edit Differences ... ==== //depot/projects/mjexp_6/sbin/geom/class/Makefile#2 (text+ko) ==== @@ -6,6 +6,7 @@ .endif SUBDIR+=label SUBDIR+=mirror +SUBDIR+=multipath SUBDIR+=nop SUBDIR+=raid3 SUBDIR+=shsec From owner-p4-projects@FreeBSD.ORG Tue Dec 19 18:44:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3592E16A494; Tue, 19 Dec 2006 18:44:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13E0016A40F for ; Tue, 19 Dec 2006 18:44:05 +0000 (UTC) (envelope-from cvance@chrisandkaren.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C6E43CBD for ; Tue, 19 Dec 2006 18:44:00 +0000 (GMT) (envelope-from cvance@chrisandkaren.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJIhxs9000890 for ; Tue, 19 Dec 2006 18:43:59 GMT (envelope-from cvance@chrisandkaren.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJIhxiB000886 for perforce@freebsd.org; Tue, 19 Dec 2006 18:43:59 GMT (envelope-from cvance@chrisandkaren.net) Date: Tue, 19 Dec 2006 18:43:59 GMT Message-Id: <200612191843.kBJIhxiB000886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@chrisandkaren.net using -f From: Chris Vance To: Perforce Change Reviews Cc: Subject: PERFORCE change 111953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 18:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=111953 Change 111953 by cvance@cvance_sony on 2006/12/19 18:43:01 Update SELinux Reference Policy URL. Spotted by brooks. Affected files ... .. //depot/projects/trustedbsd/www/sebsd.page#7 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#7 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#6 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#7 $ @@ -80,7 +80,7 @@ Install notes. This SEBSD snapshot is based on a March 2006 snapshot of FreeBSD 7.x and SELinux sources from the same timeframe. It also includes the new - SELinux Reference Policy + SELinux Reference Policy as a new policy baseline. It should be noted that SEBSD will not currently function in enforcing mode as the new policy development is still at a relatively early stage.

From owner-p4-projects@FreeBSD.ORG Wed Dec 20 00:00:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235CE16A415; Wed, 20 Dec 2006 00:00:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E94FD16A40F for ; Wed, 20 Dec 2006 00:00:48 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A962043CA2 for ; Wed, 20 Dec 2006 00:00:48 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBK00meS069879 for ; Wed, 20 Dec 2006 00:00:48 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBK00mQA069876 for perforce@freebsd.org; Wed, 20 Dec 2006 00:00:48 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 20 Dec 2006 00:00:48 GMT Message-Id: <200612200000.kBK00mQA069876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 00:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=111965 Change 111965 by mjacob@mjexp on 2006/12/19 23:59:51 Add the toy multipath as options so we can make it static. Affected files ... .. //depot/projects/mjexp/sys/conf/NOTES#6 edit .. //depot/projects/mjexp/sys/conf/files#7 edit .. //depot/projects/mjexp/sys/conf/options#5 edit Differences ... ==== //depot/projects/mjexp/sys/conf/NOTES#6 (text+ko) ==== @@ -149,6 +149,7 @@ options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_MIRROR # Disk mirroring. +options GEOM_MULTIPATH # Disk multipath options GEOM_NOP # Test class. options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. ==== //depot/projects/mjexp/sys/conf/files#7 (text+ko) ==== @@ -1209,6 +1209,7 @@ geom/label/g_label_ufs.c optional geom_label geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror +geom/multipath/g_multipath.c optional geom_multipath geom/nop/g_nop.c optional geom_nop geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 ==== //depot/projects/mjexp/sys/conf/options#5 (text+ko) ==== @@ -87,6 +87,7 @@ GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h +GEOM_MULTIPATH opt_geom.h GEOM_NOP opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h From owner-p4-projects@FreeBSD.ORG Wed Dec 20 00:00:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1457816A501; Wed, 20 Dec 2006 00:00:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5E9B16A563 for ; Wed, 20 Dec 2006 00:00:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E8A043C9F for ; Wed, 20 Dec 2006 00:00:49 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBK00nCA069886 for ; Wed, 20 Dec 2006 00:00:49 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBK00mgM069882 for perforce@freebsd.org; Wed, 20 Dec 2006 00:00:48 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 20 Dec 2006 00:00:48 GMT Message-Id: <200612200000.kBK00mgM069882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 00:00:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=111966 Change 111966 by mjacob@mjexp_6 on 2006/12/20 00:00:12 Add the toy multipath as options so we can make it static. Affected files ... .. //depot/projects/mjexp_6/sys/conf/NOTES#2 edit .. //depot/projects/mjexp_6/sys/conf/files#2 edit .. //depot/projects/mjexp_6/sys/conf/options#2 edit Differences ... ==== //depot/projects/mjexp_6/sys/conf/NOTES#2 (text+ko) ==== @@ -138,6 +138,7 @@ options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_MIRROR # Disk mirroring. +options GEOM_MULTIPATH # Disk multipath options GEOM_NOP # Test class. options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. ==== //depot/projects/mjexp_6/sys/conf/files#2 (text+ko) ==== @@ -1138,6 +1138,7 @@ geom/label/g_label_ufs.c optional geom_label geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror +geom/multipath/g_multipath.c optional geom_multipath geom/nop/g_nop.c optional geom_nop geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 ==== //depot/projects/mjexp_6/sys/conf/options#2 (text+ko) ==== @@ -86,6 +86,7 @@ GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h +GEOM_MULTIPATH opt_geom.h GEOM_NOP opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h From owner-p4-projects@FreeBSD.ORG Wed Dec 20 00:35:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15C6B16A554; Wed, 20 Dec 2006 00:35:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BAD4716A514 for ; Wed, 20 Dec 2006 00:35:31 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2CEA43CD4 for ; Wed, 20 Dec 2006 00:35:07 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBK0YW7a077216 for ; Wed, 20 Dec 2006 00:34:32 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBK0YWtc077213 for perforce@freebsd.org; Wed, 20 Dec 2006 00:34:32 GMT (envelope-from piso@freebsd.org) Date: Wed, 20 Dec 2006 00:34:32 GMT Message-Id: <200612200034.kBK0YWtc077213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 111968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 00:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=111968 Change 111968 by piso@piso_newluxor on 2006/12/20 00:34:26 Teach them about filters. Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#4 edit .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#7 edit .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#4 (text+ko) ==== @@ -50,6 +50,7 @@ #include struct fhc_clr { + driver_filter_t *fc_filter; driver_intr_t *fc_func; void *fc_arg; void *fc_cookie; @@ -62,6 +63,7 @@ struct resource_list fdi_rl; }; +static int fhc_filter_stub(void *); static void fhc_intr_stub(void *); static void fhc_led_func(void *, int); static int fhc_print_res(struct fhc_devinfo *); @@ -238,9 +240,7 @@ fc = malloc(sizeof(*fc), M_DEVBUF, M_WAITOK | M_ZERO); if (fc == NULL) return (0); - /* - * XXX_FILTER this code doesn't take care of filters. - */ + fc->fc_filter = filter; fc->fc_func = func; fc->fc_arg = arg; fc->fc_bt = bt; @@ -249,7 +249,7 @@ bus_space_write_4(bt, bh, FHC_IMAP, inr); bus_space_read_4(bt, bh, FHC_IMAP); - error = bus_generic_setup_intr(bus, child, r, flags, filter, + error = bus_generic_setup_intr(bus, child, r, flags, fhc_filter_stub, fhc_intr_stub, fc, cookiep); if (error != 0) { free(fc, M_DEVBUF); @@ -279,15 +279,28 @@ return (error); } +static int +fhc_filter_stub(void *arg) +{ + struct fhc_clr *fc = arg; + int res; + + if (fc->fc_filter != NULL) + res = fc->fc_filter(fc->fc_arg); + else + res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; + + bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0); + bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR); + return (res); +} + static void fhc_intr_stub(void *arg) { struct fhc_clr *fc = arg; fc->fc_func(fc->fc_arg); - - bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0); - bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR); } struct resource * ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#7 (text+ko) ==== @@ -83,6 +83,7 @@ int, void *); static int psycho_find_intrmap(struct psycho_softc *, int, bus_addr_t *, bus_addr_t *, u_long *); +static int psycho_filter_stub(void *); static void psycho_intr_stub(void *); static bus_space_tag_t psycho_alloc_bus_tag(struct psycho_softc *, int); @@ -177,6 +178,7 @@ struct psycho_clr { struct psycho_softc *pci_sc; bus_addr_t pci_clr; /* clear register */ + driver_filter_t *pci_filter; driver_intr_t *pci_handler; /* handler to call */ void *pci_arg; /* argument for the handler */ void *pci_cookie; /* parent bus int. cookie */ @@ -940,6 +942,20 @@ return (ENOENT); } +static int +psycho_filter_stub(void *arg) +{ + struct psycho_clr *pc = arg; + int res; + + if (pc->pci_filter != NULL) + res = pc->pci_filter(pc->pci_arg); + else + res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; + PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); + return (res); +} + /* Write to the correct clr register, and call the actual handler. */ static void psycho_intr_stub(void *arg) @@ -947,7 +963,6 @@ struct psycho_clr *pc = arg; pc->pci_handler(pc->pci_arg); - PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); } static int @@ -988,18 +1003,16 @@ device_printf(dev, "%s: INO %d, map %#lx, clr %#lx\n", __func__, ino, (u_long)intrmapptr, (u_long)intrclrptr); #endif - /* - * XXX_FILTER this code doesn't take care of filters. - */ pc->pci_sc = sc; pc->pci_arg = arg; + pc->pci_filter = filter; pc->pci_handler = intr; pc->pci_clr = intrclrptr; /* Disable the interrupt while we fiddle with it */ mr = PSYCHO_READ8(sc, intrmapptr); PSYCHO_WRITE8(sc, intrmapptr, mr & ~INTMAP_V); error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - filter, psycho_intr_stub, pc, cookiep); + psycho_filter_stub, psycho_intr_stub, pc, cookiep); if (error != 0) { free(pc, M_DEVBUF); return (error); ==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#7 (text+ko) ==== @@ -181,6 +181,7 @@ struct sbus_clr { struct sbus_softc *scl_sc; bus_addr_t scl_clr; /* clear register */ + driver_filter_t *scl_filter; driver_intr_t *scl_handler; /* handler to call */ void *scl_arg; /* argument for the handler */ void *scl_cookie; /* parent bus int. cookie */ @@ -209,6 +210,7 @@ static struct sbus_devinfo * sbus_setup_dinfo(device_t, struct sbus_softc *, phandle_t); static void sbus_destroy_dinfo(struct sbus_devinfo *); +static int sbus_filter_stub(void *); static void sbus_intr_stub(void *); static bus_space_tag_t sbus_alloc_bustag(struct sbus_softc *); static int sbus_overtemp(void *); @@ -634,6 +636,21 @@ return (&sdi->sdi_rl); } +static int +sbus_filter_stub(void *arg) +{ + struct sbus_clr *scl; + int res; + + scl = (struct sbus_clr *)arg; + if (scl->scl_handler != NULL) + res = scl->scl_filter(scl->scl_arg); + else + res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; + SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); + return (res); +} + /* Write to the correct clr register, and call the actual handler. */ static void sbus_intr_stub(void *arg) @@ -642,7 +659,6 @@ scl = (struct sbus_clr *)arg; scl->scl_handler(scl->scl_arg); - SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); } static int @@ -693,17 +709,15 @@ panic("%s: IRQ not found!", __func__); } - /* - * XXX_FILTER this code doesn't take care of filters. - */ scl->scl_sc = sc; scl->scl_arg = arg; + scl->scl_filter = filter; scl->scl_handler = intr; scl->scl_clr = intrclrptr; /* Disable the interrupt while we fiddle with it */ SYSIO_WRITE8(sc, intrmapptr, intrmap & ~INTMAP_V); error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - filter, sbus_intr_stub, scl, cookiep); + sbus_filter_stub, sbus_intr_stub, scl, cookiep); if (error != 0) { free(scl, M_DEVBUF); return (error); From owner-p4-projects@FreeBSD.ORG Wed Dec 20 06:11:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4769C16A416; Wed, 20 Dec 2006 06:11:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C81516A407 for ; Wed, 20 Dec 2006 06:11:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A4F243CAB for ; Wed, 20 Dec 2006 06:11:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBK6BsP0071958 for ; Wed, 20 Dec 2006 06:11:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBK6Bj9T071953 for perforce@freebsd.org; Wed, 20 Dec 2006 06:11:45 GMT (envelope-from marcel@freebsd.org) Date: Wed, 20 Dec 2006 06:11:45 GMT Message-Id: <200612200611.kBK6Bj9T071953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 06:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111979 Change 111979 by marcel@marcel_cluster on 2006/12/20 06:11:03 IFC @111978 Affected files ... .. //depot/projects/powerpc/UPDATING#2 integrate .. //depot/projects/powerpc/bin/domainname/domainname.1#2 integrate .. //depot/projects/powerpc/bin/test/test.1#2 integrate .. //depot/projects/powerpc/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/powerpc/include/unistd.h#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/powerpc/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/powerpc/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/powerpc/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/powerpc/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/powerpc/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/powerpc/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/powerpc/lib/libelf/Makefile#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf.h#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf_cap.c#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf_move.c#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf_syminfo.c#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_align.c#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_fsize.m4#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_msize.m4#2 integrate .. //depot/projects/powerpc/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/powerpc/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/powerpc/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/powerpc/sbin/ggate/shared/ggate.h#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#3 integrate .. //depot/projects/powerpc/share/man/man4/aac.4#2 integrate .. //depot/projects/powerpc/share/man/man4/audit.4#2 integrate .. //depot/projects/powerpc/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/bce.4#2 integrate .. //depot/projects/powerpc/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/powerpc/share/man/man4/fdc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/iic.4#2 integrate .. //depot/projects/powerpc/share/man/man4/inet.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ipmi.4#2 integrate .. //depot/projects/powerpc/share/man/man4/joy.4#2 integrate .. //depot/projects/powerpc/share/man/man4/lmc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/powerpc/share/man/man4/pty.4#2 integrate .. //depot/projects/powerpc/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/powerpc/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/powerpc/share/man/man4/syscons.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/powerpc/share/man/man4/watchdog.4#2 integrate .. //depot/projects/powerpc/share/man/man5/elf.5#2 integrate .. //depot/projects/powerpc/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/powerpc/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/powerpc/share/man/man7/build.7#2 integrate .. //depot/projects/powerpc/share/man/man7/development.7#2 integrate .. //depot/projects/powerpc/share/man/man7/environ.7#2 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#2 integrate .. //depot/projects/powerpc/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/powerpc/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/powerpc/share/man/man9/crypto.9#2 integrate .. //depot/projects/powerpc/share/man/man9/ifnet.9#2 integrate .. //depot/projects/powerpc/share/man/man9/priv.9#2 integrate .. //depot/projects/powerpc/share/man/man9/socket.9#1 branch .. //depot/projects/powerpc/share/man/man9/sysctl.9#2 integrate .. //depot/projects/powerpc/share/man/man9/usbdi.9#2 integrate .. //depot/projects/powerpc/share/man/man9/utopia.9#2 integrate .. //depot/projects/powerpc/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/powerpc/share/man/man9/watchdog.9#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/powerpc/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/powerpc/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/powerpc/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/powerpc/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/powerpc/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/powerpc/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/powerpc/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/powerpc/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/powerpc/sys/conf/files.amd64#2 integrate .. //depot/projects/powerpc/sys/conf/files.arm#2 integrate .. //depot/projects/powerpc/sys/conf/files.i386#5 integrate .. //depot/projects/powerpc/sys/conf/files.pc98#5 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#5 integrate .. //depot/projects/powerpc/sys/conf/files.sparc64#5 integrate .. //depot/projects/powerpc/sys/conf/files.sun4v#2 integrate .. //depot/projects/powerpc/sys/conf/options#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/powerpc/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/powerpc/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/powerpc/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/powerpc/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/powerpc/sys/dev/isp/isp.c#5 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/powerpc/sys/dev/isp/ispmbox.h#5 integrate .. //depot/projects/powerpc/sys/dev/md/md.c#5 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/powerpc/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/powerpc/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/powerpc/sys/dev/pci/pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/powerpc/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/powerpc/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/powerpc/sys/dev/re/if_re.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/powerpc/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/bpb.h#4 integrate .. //depot/projects/powerpc/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/powerpc/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/exception.s#4 integrate .. //depot/projects/powerpc/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/powerpc/sys/i386/i386/trap.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/vm86.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/vm86bios.s#5 integrate .. //depot/projects/powerpc/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/powerpc/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/powerpc/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/powerpc/sys/i386/isa/icu.h#4 integrate .. //depot/projects/powerpc/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_clock.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_synch.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_thread.c#2 integrate .. //depot/projects/powerpc/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/powerpc/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/powerpc/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/powerpc/sys/kern/tty.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_export.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/powerpc/sys/modules/Makefile#6 integrate .. //depot/projects/powerpc/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#3 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.h#2 integrate .. //depot/projects/powerpc/sys/netinet6/in6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/powerpc/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/powerpc/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/powerpc/sys/pci/if_rl.c#4 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/powerpc/sys/sparc64/include/param.h#5 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/powerpc/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/powerpc/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/powerpc/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/powerpc/sys/sys/lock_profile.h#2 integrate .. //depot/projects/powerpc/sys/sys/mount.h#5 integrate .. //depot/projects/powerpc/sys/sys/mouse.h#4 integrate .. //depot/projects/powerpc/sys/sys/mutex.h#5 integrate .. //depot/projects/powerpc/sys/sys/param.h#5 integrate .. //depot/projects/powerpc/sys/sys/pcpu.h#4 integrate .. //depot/projects/powerpc/sys/sys/proc.h#5 integrate .. //depot/projects/powerpc/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/powerpc/sys/sys/umtx.h#2 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#5 integrate .. //depot/projects/powerpc/sys/sys/watchdog.h#2 integrate .. //depot/projects/powerpc/sys/vm/vm_object.c#5 integrate .. //depot/projects/powerpc/usr.bin/cmp/cmp.1#2 integrate .. //depot/projects/powerpc/usr.bin/column/column.c#2 integrate .. //depot/projects/powerpc/usr.bin/fold/fold.1#2 integrate .. //depot/projects/powerpc/usr.bin/from/from.1#2 integrate .. //depot/projects/powerpc/usr.bin/mkfifo/mkfifo.1#2 integrate .. //depot/projects/powerpc/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/powerpc/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/powerpc/usr.bin/w/w.1#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/powerpc/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/powerpc/UPDATING#2 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20061214: + Support for PCI Message Signalled Interrupts has been + disabled again in the bge driver. Many revisions of the + hardware fail to support it properly. Support can be + re-enabled by removing the #define of BGE_DISABLE_MSI in + "src/sys/dev/bge/if_bge.c". + +20061214: + Support for PCI Message Signalled Interrupts has been added + to the bge driver. If there are any problems, MSI can be + disabled completely by setting the 'hw.pci.enable_msi' and + 'hw.pci.enable_msix' tunables to 0 in the loader. + 20061205: The removal of several facets of the experimental Threading system from the kernel means that the proc and thread structures @@ -682,4 +695,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ +$FreeBSD: src/UPDATING,v 1.469 2006/12/15 00:30:37 jdp Exp $ ==== //depot/projects/powerpc/bin/domainname/domainname.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.18 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.19 2006/12/18 15:45:01 ru Exp $ .\" .Dd September 18, 1994 .Dt DOMAINNAME 1 @@ -48,7 +48,7 @@ .Pa /etc/rc.network , normally run at boot time. -.Sh NOTA BENE +.Sh NOTES The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons) domain name does not necessarily have anything to do with the Domain Name System domain name, although they are often set equal for administrative ==== //depot/projects/powerpc/bin/test/test.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -50,7 +50,9 @@ utility evaluates the expression and, if it evaluates to true, returns a zero (true) exit status; otherwise it returns 1 (false). -If there is no expression, test also +If there is no expression, +.Nm +also returns 1 (false). .Pp All operators and flags are separate arguments to the @@ -187,68 +189,68 @@ .Ar string is not the null string. -.It Ar \&s\&1 Cm \&= Ar \&s\&2 +.It Ar s1 Cm = Ar s2 True if the strings -.Ar \&s\&1 +.Ar s1 and -.Ar \&s\&2 +.Ar s2 are identical. -.It Ar \&s\&1 Cm \&!= Ar \&s\&2 +.It Ar s1 Cm != Ar s2 True if the strings -.Ar \&s\&1 +.Ar s1 and -.Ar \&s\&2 +.Ar s2 are not identical. -.It Ar \&s\&1 Cm \&< Ar \&s\&2 +.It Ar s1 Cm < Ar s2 True if string -.Ar \&s\&1 +.Ar s1 comes before -.Ar \&s\&2 +.Ar s2 based on the binary value of their characters. -.It Ar \&s\&1 Cm \&> Ar \&s\&2 +.It Ar s1 Cm > Ar s2 True if string -.Ar \&s\&1 +.Ar s1 comes after -.Ar \&s\&2 +.Ar s2 based on the binary value of their characters. -.It Ar \&n\&1 Fl \&eq Ar \&n\&2 +.It Ar n1 Fl eq Ar n2 True if the integers -.Ar \&n\&1 +.Ar n1 and -.Ar \&n\&2 +.Ar n2 are algebraically equal. -.It Ar \&n\&1 Fl \&ne Ar \&n\&2 +.It Ar n1 Fl ne Ar n2 True if the integers -.Ar \&n\&1 +.Ar n1 and -.Ar \&n\&2 +.Ar n2 are not algebraically equal. -.It Ar \&n\&1 Fl \> Ar \&n\&2 +.It Ar n1 Fl gt Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically greater than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&ge Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl ge Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically greater than or equal to the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \< Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl lt Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically less than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&le Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl le Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically less than or equal to the integer -.Ar \&n\&2 . +.Ar n2 . .El .Pp If @@ -312,7 +314,7 @@ The .Nm utility exits with one of the following values: -.Bl -tag -width Ds +.Bl -tag -width indent .It 0 expression evaluated to true. .It 1 ==== //depot/projects/powerpc/include/arpa/nameser_compat.h#2 (text+ko) ==== @@ -32,8 +32,8 @@ /* * from nameser.h 8.1 (Berkeley) 6/2/93 - * $Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $ - * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.5 2006/03/21 16:11:11 ume Exp $ + * $Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $ + * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.6 2006/12/15 20:59:55 ume Exp $ */ #ifndef _ARPA_NAMESER_COMPAT_ ==== //depot/projects/powerpc/include/unistd.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.79 2005/12/02 02:36:13 davidxu Exp $ + * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $ */ #ifndef _UNISTD_H_ @@ -294,6 +294,9 @@ #define _SC_NPROCESSORS_ONLN 58 #endif +/* Extensions found in Solaris and Linux. */ +#define _SC_PHYS_PAGES 121 + /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 #define _CS_PATH 1 /* default value of PATH */ ==== //depot/projects/powerpc/lib/libc/gen/sysconf.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.21 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.24 2006/12/14 14:34:55 pjd Exp $ .\" -.Dd June 18, 2001 +.Dd December 14, 2006 .Dt SYSCONF 3 .Os .Sh NAME @@ -89,6 +89,8 @@ The number of processors currently online. .It Li _SC_OPEN_MAX The maximum number of open files per user id. +.It Li _SC_PAGESIZE +The size of a system page in bytes. .It Li _SC_STREAM_MAX The minimum maximum number of streams that a process may have open at any one time. @@ -165,6 +167,19 @@ Return 1 if the system supports the User Portability Utilities Option, otherwise \-1. .El +.Pp +These values also exist, but may not be standard: +.Pp +.Bl -tag -width 6n +.Pp +.It Li _SC_PHYS_PAGES +The number of pages of physical memory. +Note that it is possible that the product of this value and the value of +.Li _SC_PAGESIZE +will overflow a +.Vt long +in some configurations on a 32bit machine. +.El .Sh RETURN VALUES If the call to .Fn sysconf ==== //depot/projects/powerpc/lib/libc/gen/sysconf.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.23 2006/12/14 22:14:14 imp Exp $"); #include #include @@ -79,9 +79,11 @@ int mib[2], sverrno, value; long defaultresult; const char *path; + const char *sname; len = sizeof(value); defaultresult = -1; + sname = NULL; switch (name) { case _SC_ARG_MAX: @@ -574,9 +576,22 @@ mib[1] = HW_NCPU; break; +#ifdef _SC_PHYS_PAGES + case _SC_PHYS_PAGES: + sname = "hw.availpages"; + break; +#endif + default: errno = EINVAL; return (-1); } - return (sysctl(mib, 2, &value, &len, NULL, 0) == -1 ? -1 : value); + if (sname == NULL) { + if (sysctl(mib, 2, &value, &len, NULL, 0) == -1) + value = -1; + } else { + if (sysctlbyname(sname, &value, &len, NULL, 0) == -1) + value = -1; + } + return (value); } ==== //depot/projects/powerpc/lib/libc/inet/inet_cidr_ntop.c#2 (text) ==== @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.3 2005/11/03 23:08:40 marka Exp $"; +static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.4 2006/10/11 02:32:50 marka Exp $"; #endif #include "port_before.h" @@ -40,10 +40,10 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static char * inet_cidr_ntop_ipv4 __P((const u_char *src, int bits, - char *dst, size_t size)); -static char * inet_cidr_ntop_ipv6 __P((const u_char *src, int bits, - char *dst, size_t size)); +static char * +inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size); +static char * +inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size); /* * char * ==== //depot/projects/powerpc/lib/libc/inet/inet_net_ntop.c#2 (text) ==== @@ -16,10 +16,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.1 2004/03/09 08:33:32 marka Exp $"; +static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.2 2006/06/20 02:53:07 marka Exp $"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.2 2006/03/21 15:37:15 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.3 2006/12/15 20:59:55 ume Exp $"); #include "port_before.h" @@ -266,7 +266,7 @@ } } /* Format CIDR /width. */ - SPRINTF((cp, "/%u", bits)); + sprintf(cp, "/%u", bits); if (strlen(outbuf) + 1 > size) goto emsgsize; strcpy(dst, outbuf); ==== //depot/projects/powerpc/lib/libc/isc/eventlib_p.h#2 (text) ==== @@ -18,8 +18,8 @@ /* eventlib_p.h - private interfaces for eventlib * vix 09sep95 [initial] * - * $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $ - * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.3 2006/09/22 01:52:26 kan Exp $ + * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $ + * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.4 2006/12/15 20:59:55 ume Exp $ */ #ifndef _EVENTLIB_P_H @@ -48,6 +48,8 @@ #define EV_MASK_ALL (EV_READ | EV_WRITE | EV_EXCEPT) #define EV_ERR(e) return (errno = (e), -1) #define OK(x) if ((x) < 0) EV_ERR(errno); else (void)NULL +#define OKFREE(x, y) if ((x) < 0) { FREE((y)); EV_ERR(errno); } \ + else (void)NULL #define NEW(p) if (((p) = memget(sizeof *(p))) != NULL) \ FILL(p); \ ==== //depot/projects/powerpc/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.62 2006/11/06 22:07:47 cognet Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -13,7 +13,8 @@ if_indextoname.c if_nameindex.c if_nametoindex.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ nsdispatch.c nslexer.c nsparser.c nss_compat.c \ - rcmd.c rcmdsh.c recv.c rthdr.c send.c sockatmark.c vars.c + rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ + sockatmark.c vars.c .if ${MK_NS_CACHING} != "no" SRCS+= nscache.c nscachedcli.c ==== //depot/projects/powerpc/lib/libc/resolv/mtctxres.c#2 (text) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.3 2006/12/15 20:59:55 ume Exp $"); #include #ifdef DO_PTHREADS @@ -118,9 +118,10 @@ */ if (!mt_key_initialized) { static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock(&keylock); - _mtctxres_init(); - pthread_mutex_unlock(&keylock); + if (pthread_mutex_lock(&keylock) == 0) { + _mtctxres_init(); + (void) pthread_mutex_unlock(&keylock); + } } /* ==== //depot/projects/powerpc/lib/libc/resolv/res_init.c#2 (text) ==== @@ -70,10 +70,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.6 2006/08/30 23:23:01 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.3 2006/08/04 10:21:11 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.4 2006/12/15 20:59:55 ume Exp $"); #include "port_before.h" @@ -243,17 +243,10 @@ if (buf[0] == '+') buf[0] = '.'; cp = strchr(buf, '.'); - if (cp == NULL) { - if (strlcpy(statp->defdname, buf, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } else { - if (strlcpy(statp->defdname, cp+1, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } + cp = (cp == NULL) ? buf : (cp + 1); + if (strlen(cp) >= sizeof(statp->defdname)) + goto freedata; + strcpy(statp->defdname, cp); } } #endif /* SOLARIS2 */ ==== //depot/projects/powerpc/lib/libc/resolv/res_send.c#2 (text) ==== @@ -70,10 +70,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $"; +static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.9 2006/10/16 23:00:50 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.4 2006/10/24 14:41:43 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.5 2006/12/15 20:59:55 ume Exp $"); /* * Send query to name server and wait for reply. @@ -313,7 +313,8 @@ highestFD = sysconf(_SC_OPEN_MAX) - 1; #endif - if (statp->nscount == 0) { + /* No name servers or res_init() failure */ + if (statp->nscount == 0 || EXT(statp).ext == NULL) { errno = ESRCH; return (-1); } ==== //depot/projects/powerpc/lib/libc/stdtime/strftime.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.37 2005/07/31 03:30:44 keramida Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.38 2006/12/19 20:20:39 jmg Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -119,7 +119,7 @@ to represent alternative months names (used standalone, without day mentioned). .It Cm %e -is replaced by the day of month as a decimal number (1-31); single +is replaced by the day of the month as a decimal number (1-31); single digits are preceded by a blank. .It Cm \&%F is equivalent to ==== //depot/projects/powerpc/lib/libc/sys/chflags.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.2 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.27 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.28 2006/12/15 19:23:27 pjd Exp $ .\" .Dd May 16, 2006 .Dt CHFLAGS 2 @@ -162,6 +162,10 @@ .Dv SF_IMMUTABLE , SF_APPEND , or .Dv SF_NOUNLINK . +.It Bq Er EPERM +User tries to set or remove the +.Dv SF_SNAPSHOT +flag. .It Bq Er EROFS The named file resides on a read-only file system. .It Bq Er EFAULT ==== //depot/projects/powerpc/lib/libelf/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libelf/Makefile,v 1.3 2006/11/24 06:38:11 ru Exp $ +# $FreeBSD: src/lib/libelf/Makefile,v 1.4 2006/12/18 05:40:01 jkoshy Exp $ LIB= elf @@ -24,16 +24,19 @@ elf_strptr.c \ elf_update.c \ elf_version.c \ + gelf_cap.c \ gelf_checksum.c \ - gelf_fsize.c \ - gelf_getclass.c \ gelf_dyn.c \ gelf_ehdr.c \ + gelf_getclass.c \ + gelf_fsize.c \ + gelf_move.c \ gelf_phdr.c \ gelf_rel.c \ gelf_rela.c \ gelf_shdr.c \ gelf_sym.c \ + gelf_syminfo.c \ gelf_symshndx.c \ gelf_xlate.c \ libelf.c \ @@ -53,16 +56,8 @@ CLEANFILES= ${GENSRCS} CFLAGS+= -I. -I${.CURDIR} -OSRELDATE!= sysctl -n kern.osreldate - SHLIB_MAJOR= 1 -.if ${OSRELDATE} > 700009 -SRCS+= gelf_cap.c \ - gelf_move.c \ - gelf_syminfo.c -.endif - WARNS?= 6 MAN= elf.3 \ @@ -162,4 +157,4 @@ # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: - m4 -D SRCDIR=${.CURDIR} -D OSRELDATE=${OSRELDATE} ${.IMPSRC} > ${.TARGET} + m4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET} ==== //depot/projects/powerpc/lib/libelf/elf_getshnum.3#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.3 2006/12/16 10:45:43 jkoshy Exp $ .\" .Dd October 31, 2006 .Os @@ -41,7 +41,7 @@ retrieves the number of ELF sections associated with descriptor .Ar elf and stores it into the location pointed to by argument -.Ar sz . +.Ar shnum . .Pp This routine allows applications to uniformly process both normal ELF objects, and ELF objects that use extended section numbering. ==== //depot/projects/powerpc/lib/libelf/elf_types.m4#2 (text+ko) ==== @@ -23,38 +23,48 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libelf/elf_types.m4,v 1.1 2006/11/11 17:16:33 jkoshy Exp $ + * $FreeBSD: src/lib/libelf/elf_types.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $ */ /* * ELF types, defined in the "enum Elf_Type" API. + * + * The members of the list form a 3-tuple: (name, C-type-suffix, OSversion). + * + `name' is an Elf_Type symbol without the `ELF_T_' prefix. + * + `C-type-suffix' is the suffix for Elf32_ and Elf64_ type names. + * + `version' is the OS version the symbol first appeared in. + * + * OS revisions of note are: + * 600102 - The earliest (6.0-STABLE) version supported by this code. + * 700009 - Symbol versioning and ELF64 type changes. + * 700025 - More ELF types and the introduction of libelf. */ define(`ELF_TYPE_LIST', - ``ADDR, Addr', - `BYTE, Byte', - `CAP, Cap', - `DYN, Dyn', - `EHDR, Ehdr', - `HALF, Half', - `LWORD, Lword', - `MOVE, Move', - `MOVEP, MoveP', - `NOTE, Note', - `OFF, Off', - `PHDR, Phdr', - `REL, Rel', - `RELA, Rela', - `SHDR, Shdr', - `SWORD, Sword', - `SXWORD, Sxword', - `SYMINFO, Syminfo', - `SYM, Sym', - `VDEF, Verdef', - `VNEED, Verneed', - `WORD, Word', - `XWORD, Xword', - `NUM, _'') + ``ADDR, Addr, 600102', + `BYTE, Byte, 600102', + `CAP, Cap, 700025', + `DYN, Dyn, 600102', + `EHDR, Ehdr, 600102', + `HALF, Half, 600102', + `LWORD, Lword, 700025', + `MOVE, Move, 700025', + `MOVEP, MoveP, 700025', + `NOTE, Note, 600102', + `OFF, Off, 600102', + `PHDR, Phdr, 600102', + `REL, Rel, 600102', + `RELA, Rela, 600102', + `SHDR, Shdr, 600102', + `SWORD, Sword, 600102', + `SXWORD, Sxword, 700009', + `SYMINFO, Syminfo, 700025', + `SYM, Sym, 600102', + `VDEF, Verdef, 700009', + `VNEED, Verneed, 700009', + `WORD, Word, 600102', + `XWORD, Xword, 700009', + `NUM, _, _'') /* * DEFINE_STRUCT(NAME,MEMBERLIST...) ==== //depot/projects/powerpc/lib/libelf/gelf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libelf/gelf.h,v 1.1 2006/11/11 17:16:33 jkoshy Exp $ + * $FreeBSD: src/lib/libelf/gelf.h,v 1.2 2006/12/18 05:40:01 jkoshy Exp $ */ #ifndef _GELF_H_ @@ -50,7 +50,7 @@ typedef Elf64_Rel GElf_Rel; /* Relocation entries */ typedef Elf64_Rela GElf_Rela; /* Relocation entries with addend */ -#if __FreeBSD_version > 700009 +#if __FreeBSD_version >= 700025 typedef Elf64_Cap GElf_Cap; /* SW/HW capabilities */ typedef Elf64_Move GElf_Move; /* Move entries */ typedef Elf64_Syminfo GElf_Syminfo; /* Symbol information */ @@ -84,7 +84,7 @@ Elf_Data *gelf_xlatetof(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode); Elf_Data *gelf_xlatetom(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode); -#if __FreeBSD_version > 700009 +#if __FreeBSD_version >= 700025 GElf_Cap *gelf_getcap(Elf_Data *_data, int _index, GElf_Cap *_cap); GElf_Move *gelf_getmove(Elf_Data *_src, int _index, GElf_Move *_dst); GElf_Syminfo *gelf_getsyminfo(Elf_Data *_src, int _index, GElf_Syminfo *_dst); ==== //depot/projects/powerpc/lib/libelf/gelf_cap.c#2 (text+ko) ==== @@ -25,15 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/gelf_cap.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/gelf_cap.c,v 1.2 2006/12/18 05:40:01 jkoshy Exp $"); #include #include #include +#include #include "_libelf.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 20 06:22:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D54216A533; Wed, 20 Dec 2006 06:22:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4558116A512 for ; Wed, 20 Dec 2006 06:22:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05D7643CA0 for ; Wed, 20 Dec 2006 06:22:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBK6MBxm074080 for ; Wed, 20 Dec 2006 06:22:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBK6L6CI072914 for perforce@freebsd.org; Wed, 20 Dec 2006 06:21:06 GMT (envelope-from marcel@freebsd.org) Date: Wed, 20 Dec 2006 06:21:06 GMT Message-Id: <200612200621.kBK6L6CI072914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 111980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 06:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=111980 Change 111980 by marcel@marcel_cluster on 2006/12/20 06:20:42 IFC @111978 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#15 integrate .. //depot/projects/ia64/UPDATING#94 integrate .. //depot/projects/ia64/bin/domainname/domainname.1#6 integrate .. //depot/projects/ia64/bin/hostname/hostname.1#7 integrate .. //depot/projects/ia64/bin/hostname/hostname.c#7 integrate .. //depot/projects/ia64/bin/test/test.1#7 integrate .. //depot/projects/ia64/contrib/bind9/CHANGES#7 integrate .. //depot/projects/ia64/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/ia64/contrib/bind9/FAQ#4 integrate .. //depot/projects/ia64/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/ia64/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/README#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/ia64/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/ia64/contrib/bind9/configure.in#5 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/ia64/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/ia64/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/ia64/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/ia64/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/ia64/contrib/bind9/version#7 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#7 integrate .. //depot/projects/ia64/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/ia64/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/ia64/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_altq.c#5 integrate .. //depot/projects/ia64/contrib/top/sigconv.awk#2 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#43 integrate .. //depot/projects/ia64/etc/pccard_ether#20 integrate .. //depot/projects/ia64/etc/rc.d/auto_linklocal#4 integrate .. //depot/projects/ia64/etc/rc.initdiskless#7 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#62 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#20 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#32 integrate .. //depot/projects/ia64/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/ia64/include/unistd.h#30 integrate .. //depot/projects/ia64/lib/bind/bind/config.h#4 integrate .. //depot/projects/ia64/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/ia64/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/ia64/lib/bind/config.h#5 integrate .. //depot/projects/ia64/lib/bind/dns/code.h#3 integrate .. //depot/projects/ia64/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/ia64/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/ia64/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/ia64/lib/bind/lwres/lwres/platform.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/ia64/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/ia64/lib/libc/gen/confstr.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/err.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/sysconf.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/sysconf.c#10 integrate .. //depot/projects/ia64/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/ia64/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/ia64/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/ia64/lib/libc/net/Makefile.inc#17 integrate .. //depot/projects/ia64/lib/libc/net/nscachedcli.c#3 integrate .. //depot/projects/ia64/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/ia64/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/ia64/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/ia64/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#12 integrate .. //depot/projects/ia64/lib/libc/sys/chflags.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/chown.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/close.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#17 integrate .. //depot/projects/ia64/lib/libc/sys/link.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/mkdir.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/rename.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/rmdir.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/symlink.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/truncate.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/unlink.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#9 integrate .. //depot/projects/ia64/lib/libelf/Makefile#3 integrate .. //depot/projects/ia64/lib/libelf/elf.3#2 integrate .. //depot/projects/ia64/lib/libelf/elf_errmsg.c#2 integrate .. //depot/projects/ia64/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/ia64/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/ia64/lib/libelf/gelf.h#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_cap.c#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_getsymshndx.3#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_move.c#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_syminfo.c#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_align.c#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_fsize.m4#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_msize.m4#2 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#31 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#53 integrate .. //depot/projects/ia64/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/include/pthread_md.h#6 integrate .. //depot/projects/ia64/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_barrier.c#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#12 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#17 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#23 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#23 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#29 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#30 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.h#6 integrate .. //depot/projects/ia64/release/Makefile#102 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#99 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/Makefile#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#4 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#168 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#3 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#3 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#5 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#4 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#4 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#5 delete .. //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#12 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#20 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#16 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.8#7 integrate .. //depot/projects/ia64/sbin/ggate/ggated/ggated.c#5 integrate .. //depot/projects/ia64/sbin/ggate/shared/ggate.c#7 integrate .. //depot/projects/ia64/sbin/ggate/shared/ggate.h#4 integrate .. //depot/projects/ia64/sbin/ifconfig/ifbridge.c#7 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#44 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#17 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#13 integrate .. //depot/projects/ia64/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/ia64/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.8#8 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#11 integrate .. //depot/projects/ia64/sbin/restore/main.c#12 integrate .. //depot/projects/ia64/sbin/restore/restore.8#17 integrate .. //depot/projects/ia64/sbin/restore/restore.c#11 integrate .. //depot/projects/ia64/sbin/restore/restore.h#9 integrate .. //depot/projects/ia64/sbin/restore/tape.c#16 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#27 integrate .. //depot/projects/ia64/share/man/man4/Makefile#99 integrate .. //depot/projects/ia64/share/man/man4/aac.4#14 integrate .. //depot/projects/ia64/share/man/man4/altq.4#11 integrate .. //depot/projects/ia64/share/man/man4/ata.4#22 integrate .. //depot/projects/ia64/share/man/man4/ath.4#29 integrate .. //depot/projects/ia64/share/man/man4/audit.4#4 integrate .. //depot/projects/ia64/share/man/man4/auditpipe.4#3 integrate .. //depot/projects/ia64/share/man/man4/bce.4#3 integrate .. //depot/projects/ia64/share/man/man4/fast_ipsec.4#6 integrate .. //depot/projects/ia64/share/man/man4/fdc.4#7 integrate .. //depot/projects/ia64/share/man/man4/iic.4#4 integrate .. //depot/projects/ia64/share/man/man4/inet.4#13 integrate .. //depot/projects/ia64/share/man/man4/ipmi.4#4 integrate .. //depot/projects/ia64/share/man/man4/joy.4#7 integrate .. //depot/projects/ia64/share/man/man4/lmc.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/ia64/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_ibm.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/padlock.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/ia64/share/man/man4/miibus.4#11 integrate .. //depot/projects/ia64/share/man/man4/msk.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_ksocket.4#7 integrate .. //depot/projects/ia64/share/man/man4/ng_tag.4#3 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#19 integrate .. //depot/projects/ia64/share/man/man4/polling.4#20 integrate .. //depot/projects/ia64/share/man/man4/pty.4#7 integrate .. //depot/projects/ia64/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/ia64/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_es137x.4#7 integrate .. //depot/projects/ia64/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/ia64/share/man/man4/snd_via8233.4#6 integrate .. //depot/projects/ia64/share/man/man4/syscons.4#16 integrate .. //depot/projects/ia64/share/man/man4/ubtbcmfw.4#8 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#16 integrate .. //depot/projects/ia64/share/man/man4/watchdog.4#6 integrate .. //depot/projects/ia64/share/man/man5/elf.5#13 integrate .. //depot/projects/ia64/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#77 integrate .. //depot/projects/ia64/share/man/man7/build.7#18 integrate .. //depot/projects/ia64/share/man/man7/development.7#10 integrate .. //depot/projects/ia64/share/man/man7/environ.7#9 integrate .. //depot/projects/ia64/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#66 integrate .. //depot/projects/ia64/share/man/man9/bpf.9#6 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#21 integrate .. //depot/projects/ia64/share/man/man9/config_intrhook.9#3 integrate .. //depot/projects/ia64/share/man/man9/crypto.9#8 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#19 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#25 integrate .. //depot/projects/ia64/share/man/man9/priv.9#2 integrate .. //depot/projects/ia64/share/man/man9/socket.9#1 branch .. //depot/projects/ia64/share/man/man9/sysctl.9#4 integrate .. //depot/projects/ia64/share/man/man9/uio.9#10 integrate .. //depot/projects/ia64/share/man/man9/usbdi.9#2 integrate .. //depot/projects/ia64/share/man/man9/utopia.9#4 integrate .. //depot/projects/ia64/share/man/man9/vm_map_stack.9#4 integrate .. //depot/projects/ia64/share/man/man9/watchdog.9#3 integrate .. //depot/projects/ia64/share/misc/pci_vendors#25 integrate .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/exception.S#15 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#45 integrate .. //depot/projects/ia64/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable_pci.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#59 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#31 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#40 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#12 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#14 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#10 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#25 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#13 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic_vector.S#6 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#16 integrate .. //depot/projects/ia64/sys/amd64/isa/icu.h#7 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#17 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#14 integrate .. //depot/projects/ia64/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/ia64/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/ia64/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/ia64/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/ia64/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/ia64/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/ia64/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/ia64/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#14 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_space.c#7 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#16 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/ia64/sys/boot/common/bootstrap.h#11 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#34 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#34 integrate .. //depot/projects/ia64/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#22 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#11 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#24 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#35 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#32 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#72 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#12 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#25 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#13 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#21 integrate .. //depot/projects/ia64/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#51 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#30 integrate .. //depot/projects/ia64/sys/conf/NOTES#113 integrate .. //depot/projects/ia64/sys/conf/files#153 integrate .. //depot/projects/ia64/sys/conf/files.amd64#43 integrate .. //depot/projects/ia64/sys/conf/files.arm#9 integrate .. //depot/projects/ia64/sys/conf/files.i386#82 integrate .. //depot/projects/ia64/sys/conf/files.pc98#69 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#30 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#51 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#7 integrate .. //depot/projects/ia64/sys/conf/options#103 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah_desc.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah_devid.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-be-elf.inc#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/armv4-le-elf.inc#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-be-elf.inc#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/public/xscale-le-elf.inc#4 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/version.h#9 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#32 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#39 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#20 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#10 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#11 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#15 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#17 integrate .. //depot/projects/ia64/sys/dev/aha/aha_isa.c#13 integrate .. //depot/projects/ia64/sys/dev/aha/aha_mca.c#11 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#16 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#18 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#27 integrate .. //depot/projects/ia64/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/ia64/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#35 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#72 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.h#4 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#36 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/ath/if_athrate.h#4 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#23 integrate .. //depot/projects/ia64/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/ia64/sys/dev/awi/awivar.h#8 integrate .. //depot/projects/ia64/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#71 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#41 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#17 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#10 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#9 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#8 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#48 integrate .. //depot/projects/ia64/sys/dev/dc/if_dc.c#11 integrate .. //depot/projects/ia64/sys/dev/dc/if_dcreg.h#7 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_eisa.c#8 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#23 integrate .. //depot/projects/ia64/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#29 integrate .. //depot/projects/ia64/sys/dev/flash/at45d.c#1 branch .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#70 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#18 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#28 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemvar.h#11 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#30 integrate .. //depot/projects/ia64/sys/dev/hme/if_hmevar.h#9 integrate .. //depot/projects/ia64/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbb.c#8 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbus_if.m#4 integrate .. //depot/projects/ia64/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/ia64/sys/dev/iicbus/iiconf.h#6 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#33 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#36 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#35 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#19 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#19 integrate .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#19 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#27 integrate .. //depot/projects/ia64/sys/dev/ispfw/ispfw.c#13 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/ia64/sys/dev/le/am7990.c#3 integrate .. //depot/projects/ia64/sys/dev/le/am79900.c#3 integrate .. //depot/projects/ia64/sys/dev/le/lance.c#3 integrate .. //depot/projects/ia64/sys/dev/le/lancevar.h#3 integrate .. //depot/projects/ia64/sys/dev/md/md.c#57 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/ia64/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/ia64/sys/dev/mii/acphy.c#15 integrate .. //depot/projects/ia64/sys/dev/mii/amphy.c#13 integrate .. //depot/projects/ia64/sys/dev/mii/bmtphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#31 integrate .. //depot/projects/ia64/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phy.c#12 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/ia64/sys/dev/mii/inphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/ia64/sys/dev/mii/lxtphy.c#15 integrate .. //depot/projects/ia64/sys/dev/mii/mii_physubr.c#14 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#18 integrate .. //depot/projects/ia64/sys/dev/mii/miivar.h#8 integrate .. //depot/projects/ia64/sys/dev/mii/mlphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/nsgphy.c#17 integrate .. //depot/projects/ia64/sys/dev/mii/nsphy.c#14 integrate .. //depot/projects/ia64/sys/dev/mii/pnaphy.c#14 integrate .. //depot/projects/ia64/sys/dev/mii/qsphy.c#15 integrate .. //depot/projects/ia64/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/rlphy.c#18 integrate .. //depot/projects/ia64/sys/dev/mii/tdkphy.c#15 integrate .. //depot/projects/ia64/sys/dev/mii/tlphy.c#13 integrate .. //depot/projects/ia64/sys/dev/mii/xmphy.c#14 integrate .. //depot/projects/ia64/sys/dev/mk48txx/mk48txx.c#8 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#27 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#17 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#17 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_debug.c#13 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#27 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/ia64/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/ia64/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/ia64/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/ia64/sys/dev/nve/if_nvereg.h#6 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#64 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#17 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#9 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#17 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#19 integrate .. //depot/projects/ia64/sys/dev/ppbus/vpo.c#11 integrate .. //depot/projects/ia64/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/ia64/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/ia64/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/ia64/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#32 integrate .. //depot/projects/ia64/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/ia64/sys/dev/sk/if_skreg.h#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#38 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#25 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#29 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#28 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#38 integrate .. //depot/projects/ia64/sys/dev/usb/if_auereg.h#13 integrate .. //depot/projects/ia64/sys/dev/usb/usb_ethersubr.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/usb_ethersubr.h#6 integrate .. //depot/projects/ia64/sys/dev/vge/if_vge.c#11 integrate .. //depot/projects/ia64/sys/dev/watchdog/watchdog.c#4 integrate .. //depot/projects/ia64/sys/dev/wds/wd7000.c#8 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#67 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#23 integrate .. //depot/projects/ia64/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#43 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#37 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#21 integrate .. //depot/projects/ia64/sys/fs/unionfs/union.h#12 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#24 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#25 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#29 integrate .. //depot/projects/ia64/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#69 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#12 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#19 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#77 integrate .. //depot/projects/ia64/sys/i386/i386/mptable_pci.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#19 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#57 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/vm86bios.s#6 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#15 integrate .. //depot/projects/ia64/sys/i386/include/intr_machdep.h#11 integrate .. //depot/projects/ia64/sys/i386/isa/atpic.c#14 integrate .. //depot/projects/ia64/sys/i386/isa/atpic_vector.s#7 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#35 integrate .. //depot/projects/ia64/sys/i386/isa/icu.h#10 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#30 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#29 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#124 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.h#9 integrate .. //depot/projects/ia64/sys/kern/init_main.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#69 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_kse.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/ia64/sys/kern/kern_poll.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#69 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#48 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#68 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#98 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#25 integrate .. //depot/projects/ia64/sys/kern/ksched.c#2 integrate .. //depot/projects/ia64/sys/kern/link_elf_obj.c#9 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#40 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#52 integrate .. //depot/projects/ia64/sys/kern/subr_lock.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#41 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#54 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#57 integrate .. //depot/projects/ia64/sys/kern/sysv_ipc.c#11 integrate .. //depot/projects/ia64/sys/kern/tty.c#51 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#88 integrate .. //depot/projects/ia64/sys/kern/vfs_export.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#54 integrate .. //depot/projects/ia64/sys/modules/Makefile#102 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#29 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi/Makefile#10 integrate .. //depot/projects/ia64/sys/modules/isp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/msk/Makefile#1 branch .. //depot/projects/ia64/sys/net/bridgestp.c#12 integrate .. //depot/projects/ia64/sys/net/bridgestp.h#5 integrate .. //depot/projects/ia64/sys/net/ethernet.h#10 integrate .. //depot/projects/ia64/sys/net/if.c#55 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#22 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#15 integrate .. //depot/projects/ia64/sys/net/if_bridgevar.h#10 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#54 integrate .. //depot/projects/ia64/sys/net/if_llc.h#7 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#30 integrate .. //depot/projects/ia64/sys/net/if_pppvar.h#10 integrate .. //depot/projects/ia64/sys/net/if_spppsubr.c#25 integrate .. //depot/projects/ia64/sys/net/ppp_tty.c#18 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#22 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/ia64/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/ia64/sys/netinet/igmp.c#19 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#50 integrate .. //depot/projects/ia64/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#63 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#59 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_local.h#4 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_util.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/ia64/sys/netinet/sctputil.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctputil.h#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#73 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#45 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#13 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#32 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#28 integrate .. //depot/projects/ia64/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/ia64/sys/netinet6/in6_var.h#13 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#20 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#38 integrate .. //depot/projects/ia64/sys/netinet6/ip6_mroute.c#23 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#26 integrate .. //depot/projects/ia64/sys/netinet6/mld6.c#17 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#30 integrate .. //depot/projects/ia64/sys/netinet6/nd6_nbr.c#19 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/ia64/sys/netinet6/scope6.c#10 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#31 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#17 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#12 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#27 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#14 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_node.c#26 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#39 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#44 integrate .. //depot/projects/ia64/sys/nfsclient/nfsdiskless.h#7 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#29 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#64 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#35 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#62 integrate .. //depot/projects/ia64/sys/pci/if_xlreg.h#20 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#18 integrate .. //depot/projects/ia64/sys/powerpc/include/pmap.h#14 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/genassym.c#17 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#50 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/mmu_if.m#6 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/mmu_oea.c#6 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofw_machdep.c#13 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/uio_machdep.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#37 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#28 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#35 integrate .. //depot/projects/ia64/sys/sparc64/include/param.h#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#21 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#33 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#64 integrate .. //depot/projects/ia64/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/ia64/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/ia64/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/ia64/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/ia64/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/ia64/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/ia64/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#6 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hcall.S#5 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/interrupt.S#5 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#8 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/ia64/sys/sys/interrupt.h#12 integrate .. //depot/projects/ia64/sys/sys/lock_profile.h#5 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#36 integrate .. //depot/projects/ia64/sys/sys/mount.h#41 integrate .. //depot/projects/ia64/sys/sys/mouse.h#7 integrate .. //depot/projects/ia64/sys/sys/mutex.h#31 integrate .. //depot/projects/ia64/sys/sys/param.h#80 integrate .. //depot/projects/ia64/sys/sys/pcpu.h#15 integrate .. //depot/projects/ia64/sys/sys/proc.h#107 integrate .. //depot/projects/ia64/sys/sys/rtprio.h#7 integrate .. //depot/projects/ia64/sys/sys/runq.h#5 integrate .. //depot/projects/ia64/sys/sys/sched.h#16 integrate .. //depot/projects/ia64/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/ia64/sys/sys/uio.h#20 integrate .. //depot/projects/ia64/sys/sys/umtx.h#14 integrate .. //depot/projects/ia64/sys/sys/vnode.h#59 integrate .. //depot/projects/ia64/sys/sys/watchdog.h#4 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#53 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#91 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#81 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#21 integrate .. //depot/projects/ia64/tools/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/projects/ia64/tools/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.sh#6 integrate .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/projects/ia64/usr.bin/apply/apply.1#5 integrate .. //depot/projects/ia64/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate .. //depot/projects/ia64/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#64 integrate .. //depot/projects/ia64/usr.bin/cmp/cmp.1#5 integrate .. //depot/projects/ia64/usr.bin/column/column.c#10 integrate .. //depot/projects/ia64/usr.bin/find/find.1#25 integrate .. //depot/projects/ia64/usr.bin/fold/fold.1#8 integrate .. //depot/projects/ia64/usr.bin/from/from.1#6 integrate .. //depot/projects/ia64/usr.bin/getconf/getconf.c#9 integrate .. //depot/projects/ia64/usr.bin/id/id.c#12 integrate .. //depot/projects/ia64/usr.bin/jot/jot.c#9 integrate .. //depot/projects/ia64/usr.bin/login/Makefile#12 integrate .. //depot/projects/ia64/usr.bin/login/login.c#22 integrate .. //depot/projects/ia64/usr.bin/login/login.h#5 integrate .. //depot/projects/ia64/usr.bin/mkfifo/mkfifo.1#5 integrate .. //depot/projects/ia64/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/ia64/usr.bin/nslookup/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/nsupdate/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/setchannel/Makefile#1 branch .. //depot/projects/ia64/usr.bin/setchannel/setchannel.1#1 branch .. //depot/projects/ia64/usr.bin/setchannel/setchannel.c#1 branch .. //depot/projects/ia64/usr.bin/top/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/top/sigdesc.h#2 delete .. //depot/projects/ia64/usr.bin/truncate/truncate.1#6 integrate .. //depot/projects/ia64/usr.bin/truss/truss.1#9 integrate .. //depot/projects/ia64/usr.bin/tty/tty.1#4 integrate .. //depot/projects/ia64/usr.bin/w/w.1#5 integrate .. //depot/projects/ia64/usr.bin/what/what.1#8 integrate .. //depot/projects/ia64/usr.bin/which/which.1#7 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#19 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.8#10 integrate .. //depot/projects/ia64/usr.sbin/asf/asf.8#9 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/ia64/usr.sbin/eeprom/eeprom.8#5 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.8#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#24 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/index.c#15 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#56 integrate .. //depot/projects/ia64/usr.sbin/watchdogd/watchdogd.c#11 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.65 2006/11/26 15:04:30 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.67 2006/12/07 01:24:38 avatar Exp $ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 20 17:44:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E714716A47B; Wed, 20 Dec 2006 17:44:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9071B16A403 for ; Wed, 20 Dec 2006 17:44:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D11243CB6 for ; Wed, 20 Dec 2006 17:44:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBKHigOU041794 for ; Wed, 20 Dec 2006 17:44:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBKHig5E041791 for perforce@freebsd.org; Wed, 20 Dec 2006 17:44:42 GMT (envelope-from imp@freebsd.org) Date: Wed, 20 Dec 2006 17:44:42 GMT Message-Id: <200612201744.kBKHig5E041791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 17:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=111996 Change 111996 by imp@imp_lighthouse on 2006/12/20 17:44:20 EMERGE Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#22 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#20 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#12 (text) ==== @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../libat91 -.PATH: ${.CURDIR}/../libat91 - P=boot0 FILES=${P} SRCS=arm_init.S main.c ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#22 (text+ko) ==== @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../libat91 -.PATH: ${.CURDIR}/../libat91 - P=bootiic FILES=${P} SRCS=arm_init.S main.c loader_prompt.c env_vars.c ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#20 (text+ko) ==== @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../libat91 -.PATH: ${.CURDIR}/../libat91 - P=bootspi FILES=${P} SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c From owner-p4-projects@FreeBSD.ORG Wed Dec 20 19:56:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7356816A47C; Wed, 20 Dec 2006 19:56:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 470E916A416 for ; Wed, 20 Dec 2006 19:56:41 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5059343CA2 for ; Wed, 20 Dec 2006 19:56:36 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBKJuaiR067929 for ; Wed, 20 Dec 2006 19:56:36 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBKJuXO8067926 for perforce@freebsd.org; Wed, 20 Dec 2006 19:56:33 GMT (envelope-from jkim@freebsd.org) Date: Wed, 20 Dec 2006 19:56:33 GMT Message-Id: <200612201956.kBKJuXO8067926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 112005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2006 19:56:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=112005 Change 112005 by jkim@jkim_hammer on 2006/12/20 19:55:41 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0spi/main.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#9 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#8 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#7 integrate .. //depot/projects/linuxolator/src/sys/conf/options#10 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#6 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#9 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte_hash.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/mouse.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sysent.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/watchdog.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ */ /* @@ -60,6 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ + movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ @@ -98,7 +99,7 @@ IDTVEC(timerint) PUSH_FRAME FAKE_MCOUNT(TF_RIP(%rsp)) - + movq %rsp, %rdi call lapic_handle_timer MEXITCOUNT jmp doreti ==== //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ */ #include @@ -206,6 +206,11 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) + movl TD_TID(%rsi), %eax + movq %r8, PCPU(CURPCB) + movl %eax, PCPU(CURTID) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp @@ -217,9 +222,6 @@ movq PCB_RIP(%r8),%rax movq %rax,(%rsp) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ - /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f ==== //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.128 2006/12/17 06:48:39 kmacy Exp $ */ #include "opt_atpic.h" @@ -165,6 +165,7 @@ .globl calltrap .type calltrap,@function calltrap: + movq %rsp, %rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -267,6 +268,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -79,6 +79,7 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); @@ -190,6 +191,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.33 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.34 2006/12/17 06:48:39 kmacy Exp $"); #include "opt_hwpmc_hooks.h" @@ -610,18 +610,18 @@ } void -lapic_handle_intr(int vector, struct trapframe frame) +lapic_handle_intr(int vector, struct trapframe *frame) { struct intsrc *isrc; if (vector == -1) panic("Couldn't get vector from ISR!"); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } void -lapic_handle_timer(struct trapframe frame) +lapic_handle_timer(struct trapframe *frame) { struct lapic *la; @@ -654,16 +654,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else - hardclock_cpu(TRAPF_USERMODE(&frame)); + hardclock_cpu(TRAPF_USERMODE(frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(&frame)); + statclock(TRAPF_USERMODE(frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -671,7 +671,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } critical_exit(); } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1164,6 +1164,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.313 2006/12/17 06:48:39 kmacy Exp $"); /* * AMD64 Trap and System call handling @@ -94,8 +94,8 @@ #endif #include -extern void trap(struct trapframe frame); -extern void syscall(struct trapframe frame); +extern void trap(struct trapframe *frame); +extern void syscall(struct trapframe *frame); static int trap_pfault(struct trapframe *, int); static void trap_fatal(struct trapframe *, vm_offset_t); @@ -155,8 +155,7 @@ */ void -trap(frame) - struct trapframe frame; +trap(struct trapframe *frame) { struct thread *td = curthread; struct proc *p = td->td_proc; @@ -165,7 +164,7 @@ ksiginfo_t ksi; PCPU_LAZY_INC(cnt.v_trap); - type = frame.tf_trapno; + type = frame->tf_trapno; #ifdef SMP #ifdef STOP_NMI @@ -192,12 +191,12 @@ * the NMI was handled by it and we can return immediately. */ if (type == T_NMI && pmc_intr && - (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame.tf_rip, - TRAPF_USERMODE(&frame))) + (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame->tf_rip, + TRAPF_USERMODE(frame))) goto out; #endif - if ((frame.tf_rflags & PSL_I) == 0) { + if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled * interrupts and then trapped. Enabling interrupts @@ -205,7 +204,7 @@ * interrupts disabled until they are accidentally * enabled later. */ - if (ISPL(frame.tf_cs) == SEL_UPL) + if (ISPL(frame->tf_cs) == SEL_UPL) printf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curproc->p_comm, type); @@ -226,7 +225,7 @@ } } - code = frame.tf_err; + code = frame->tf_err; if (type == T_PAGEFLT) { /* * If we get a page fault while in a critical section, then @@ -245,15 +244,15 @@ if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, "Kernel page fault") != 0) - trap_fatal(&frame, frame.tf_addr); + trap_fatal(frame, frame->tf_addr); } - if (ISPL(frame.tf_cs) == SEL_UPL) { + if (ISPL(frame->tf_cs) == SEL_UPL) { /* user trap */ td->td_pticks = 0; - td->td_frame = &frame; - addr = frame.tf_rip; + td->td_frame = frame; + addr = frame->tf_rip; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -266,7 +265,7 @@ case T_BPTFLT: /* bpt instruction fault */ case T_TRCTRAP: /* trace trap */ enable_intr(); - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; i = SIGTRAP; ucode = (type == T_TRCTRAP ? TRAP_TRACE : TRAP_BRKPT); break; @@ -298,12 +297,12 @@ break; case T_PAGEFLT: /* page fault */ - addr = frame.tf_addr; + addr = frame->tf_addr; #ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); #endif - i = trap_pfault(&frame, TRUE); + i = trap_pfault(frame, TRUE); if (i == -1) goto userout; if (i == 0) @@ -334,7 +333,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto userout; @@ -380,7 +379,7 @@ ("kernel trap doesn't have ucred")); switch (type) { case T_PAGEFLT: /* page fault */ - (void) trap_pfault(&frame, FALSE); + (void) trap_pfault(frame, FALSE); goto out; case T_DNA: @@ -413,12 +412,12 @@ * selectors and pointers when the user changes * them. */ - if (frame.tf_rip == (long)doreti_iret) { - frame.tf_rip = (long)doreti_iret_fault; + if (frame->tf_rip == (long)doreti_iret) { + frame->tf_rip = (long)doreti_iret_fault; goto out; } if (PCPU_GET(curpcb)->pcb_onfault != NULL) { - frame.tf_rip = + frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; } @@ -434,8 +433,8 @@ * problem here and not every time the kernel is * entered. */ - if (frame.tf_rflags & PSL_NT) { - frame.tf_rflags &= ~PSL_NT; + if (frame->tf_rflags & PSL_NT) { + frame->tf_rflags &= ~PSL_NT; goto out; } break; @@ -470,7 +469,7 @@ */ #ifdef KDB /* XXX Giant */ - if (kdb_trap(type, 0, &frame)) + if (kdb_trap(type, 0, frame)) goto out; #endif break; @@ -487,7 +486,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto out; @@ -497,7 +496,7 @@ #endif /* DEV_ISA */ } - trap_fatal(&frame, 0); + trap_fatal(frame, 0); goto out; } @@ -517,13 +516,13 @@ uprintf("fatal process exception: %s", trap_msg[type]); if ((type == T_PAGEFLT) || (type == T_PROTFLT)) - uprintf(", fault VA = 0x%lx", frame.tf_addr); + uprintf(", fault VA = 0x%lx", frame->tf_addr); uprintf("\n"); } #endif user: - userret(td, &frame); + userret(td, frame); mtx_assert(&Giant, MA_NOTOWNED); userout: out: @@ -723,8 +722,7 @@ * A system call is essentially treated as a trap. */ void -syscall(frame) - struct trapframe frame; +syscall(struct trapframe *frame) { caddr_t params; struct sysent *callp; @@ -746,7 +744,7 @@ PCPU_LAZY_INC(cnt.v_syscall); #ifdef DIAGNOSTIC - if (ISPL(frame.tf_cs) != SEL_UPL) { + if (ISPL(frame->tf_cs) != SEL_UPL) { mtx_lock(&Giant); /* try to stabilize the system XXX */ panic("syscall"); /* NOT REACHED */ @@ -757,25 +755,25 @@ reg = 0; regcnt = 6; td->td_pticks = 0; - td->td_frame = &frame; + td->td_frame = frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); #ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); #endif - params = (caddr_t)frame.tf_rsp + sizeof(register_t); - code = frame.tf_rax; - orig_tf_rflags = frame.tf_rflags; + params = (caddr_t)frame->tf_rsp + sizeof(register_t); + code = frame->tf_rax; + orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. */ - (*p->p_sysent->sv_prepsyscall)(&frame, (int *)args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { - code = frame.tf_rdi; + code = frame->tf_rdi; reg++; regcnt--; } @@ -797,7 +795,7 @@ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; - argp = &frame.tf_rdi; + argp = &frame->tf_rdi; argp += reg; bcopy(argp, args, sizeof(args[0]) * regcnt); if (narg > regcnt) { @@ -817,7 +815,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_rdx; + td->td_retval[1] = frame->tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -830,9 +828,9 @@ switch (error) { case 0: - frame.tf_rax = td->td_retval[0]; - frame.tf_rdx = td->td_retval[1]; - frame.tf_rflags &= ~PSL_C; + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; break; case ERESTART: @@ -842,8 +840,8 @@ * (which was holding the value of %rcx) is restored for * the next iteration. */ - frame.tf_rip -= frame.tf_err; - frame.tf_r10 = frame.tf_rcx; + frame->tf_rip -= frame->tf_err; + frame->tf_r10 = frame->tf_rcx; td->td_pcb->pcb_flags |= PCB_FULLCTX; break; @@ -857,8 +855,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_rax = error; - frame.tf_rflags |= PSL_C; + frame->tf_rax = error; + frame->tf_rflags |= PSL_C; break; } @@ -866,11 +864,11 @@ * Traced syscall. */ if (orig_tf_rflags & PSL_T) { - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame.tf_rip; + ksi.ksi_addr = (void *)frame->tf_rip; trapsignal(td, &ksi); } @@ -890,7 +888,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_exception.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.4 2004/05/24 11:28:11 bde Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.5 2006/12/17 06:48:39 kmacy Exp $ */ #include @@ -61,6 +61,7 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call ia32_syscall MEXITCOUNT jmp doreti ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.17 2006/12/17 06:48:39 kmacy Exp $"); /* * 386 Trap and System call handling @@ -86,10 +86,10 @@ extern inthand_t IDTVEC(int0x80_syscall), IDTVEC(rsvd); extern const char *freebsd32_syscallnames[]; -void ia32_syscall(struct trapframe frame); /* Called from asm code */ +void ia32_syscall(struct trapframe *frame); /* Called from asm code */ void -ia32_syscall(struct trapframe frame) +ia32_syscall(struct trapframe *frame) { caddr_t params; int i; @@ -111,18 +111,18 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_pticks = 0; - td->td_frame = &frame; + td->td_frame = frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - params = (caddr_t)frame.tf_rsp + sizeof(u_int32_t); - code = frame.tf_rax; - orig_tf_rflags = frame.tf_rflags; + params = (caddr_t)frame->tf_rsp + sizeof(u_int32_t); + code = frame->tf_rax; + orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. */ - (*p->p_sysent->sv_prepsyscall)(&frame, args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, args, &code, ¶ms); } else { /* * Need to check if this is a 32 bit or 64 bit syscall. @@ -177,7 +177,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_rdx; + td->td_retval[1] = frame->tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -190,9 +190,9 @@ switch (error) { case 0: - frame.tf_rax = td->td_retval[0]; - frame.tf_rdx = td->td_retval[1]; - frame.tf_rflags &= ~PSL_C; + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; break; case ERESTART: @@ -200,7 +200,7 @@ * Reconstruct pc, assuming lcall $X,y is 7 bytes, * int 0x80 is 2 bytes. We saved this in tf_err. */ - frame.tf_rip -= frame.tf_err; + frame->tf_rip -= frame->tf_err; break; case EJUSTRETURN: @@ -213,8 +213,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_rax = error; - frame.tf_rflags |= PSL_C; + frame->tf_rax = error; + frame->tf_rflags |= PSL_C; break; } @@ -222,11 +222,11 @@ * Traced syscall. */ if (orig_tf_rflags & PSL_T) { - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame.tf_rip; + ksi.ksi_addr = (void *)frame->tf_rip; trapsignal(td, &ksi); } @@ -246,7 +246,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#4 (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/amd64/include/apicvar.h,v 1.20 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.21 2006/12/17 06:48:40 kmacy Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -202,8 +202,8 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(int vector, struct trapframe frame); -void lapic_handle_timer(struct trapframe frame); +void lapic_handle_intr(int vector, struct trapframe *frame); +void lapic_handle_timer(struct trapframe *frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.20 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.21 2006/12/17 06:48:40 kmacy Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -494,7 +494,7 @@ SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) void -atpic_handle_intr(u_int vector, struct trapframe frame) +atpic_handle_intr(u_int vector, struct trapframe *frame) { struct intsrc *isrc; @@ -521,7 +521,7 @@ if ((isr & IRQ_MASK(7)) == 0) return; } - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } #ifdef DEV_ISA ==== //depot/projects/linuxolator/src/sys/amd64/isa/atpic_vector.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.47 2006/09/20 20:52:11 wkoszek Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.48 2006/12/17 06:48:40 kmacy Exp $ */ /* @@ -49,6 +49,7 @@ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ FAKE_MCOUNT(TF_RIP(%rsp)) ; \ + movq %rsp, %rsi ; \ movl $irq_num, %edi; /* pass the IRQ */ \ call atpic_handle_intr ; \ MEXITCOUNT ; \ ==== //depot/projects/linuxolator/src/sys/amd64/isa/icu.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.35 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.36 2006/12/17 21:51:44 kmacy Exp $ */ /* @@ -43,7 +43,7 @@ #define ICU_IMR_OFFSET 1 -void atpic_handle_intr(u_int vector, struct trapframe frame); +void atpic_handle_intr(u_int vector, struct trapframe *frame); void atpic_startup(void); #endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.5 2006/08/09 20:58:55 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.6 2006/12/15 21:44:48 n_hibma Exp $"); #include #include @@ -170,10 +170,15 @@ uint32_t wdog; int t; - wdog = 0; t = cmd & WD_INTERVAL; - if (cmd != 0 && t >= 22 && t <= 37) + if (cmd > 0 && t >= 22 && t <= 37) { wdog = (1 << (t - 22)) | ST_WDMR_RSTEN; + *error = 0; + } else { + wdog = 0; + if (cmd > 0) + *error = EINVAL; + } WR4(ST_WDMR, wdog); WR4(ST_CR, ST_CR_WDRST); } ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.2 2005/01/15 18:38:10 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.3 2006/12/15 21:44:48 n_hibma Exp $"); #include #include @@ -62,7 +62,6 @@ device_t dev; int armed; int wdog_period; - struct callout_handle wdog_callout; }; static __inline void @@ -83,8 +82,6 @@ return; wdtcr_write(WDTCR_ENABLE1); wdtcr_write(WDTCR_ENABLE2); - sc->wdog_callout = timeout(iopwdog_tickle, sc, - hz * (sc->wdog_period - 1)); } static int @@ -112,14 +109,21 @@ { struct iopwdog_softc *sc = private; - if (cmd == 0) - return; - if ((((uint64_t)1 << (cmd & WD_INTERVAL))) > - (uint64_t)sc->wdog_period * 1000000000) - return; - sc->armed = 1; - iopwdog_tickle(sc); - *error = 0; + cmd &= WD_INTERVAL; + if (cmd > 0 && cmd <= 63 + && (uint64_t)1 << (cmd & WD_INTERVAL) <= + (uint64_t)sc->wdog_period * 1000000000) { + /* Valid value -> Enable watchdog */ + iopwdog_tickle(sc); + sc->armed = 1; + *error = 0; + } else { + /* XXX Can't disable this watchdog? */ + if (sc->armed) + *error = EOPNOTSUPP; + else if (cmd > 0) + *error = EINVAL; + } } static int ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#4 (text) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 21 11:24:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AE0516AF7B; Thu, 21 Dec 2006 11:23:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D01F916A73D for ; Thu, 21 Dec 2006 11:23:56 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72F0B13C4E2 for ; Thu, 21 Dec 2006 11:23:32 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBKKpnYK000353 for ; Wed, 20 Dec 2006 20:51:49 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBKKpmhR000340 for perforce@freebsd.org; Wed, 20 Dec 2006 20:51:48 GMT (envelope-from jkim@freebsd.org) Date: Wed, 20 Dec 2006 20:51:48 GMT Message-Id: <200612202051.kBKKpmhR000340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 112011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2006 11:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=112011 Change 112011 by jkim@jkim_hammer on 2006/12/20 20:51:05 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_time.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#13 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mac.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.10 2006/12/20 20:17:34 jkim Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.22 2006/10/15 13:39:39 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.52 2006/12/20 19:30:52 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.53 2006/12/20 20:08:45 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_time.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_time.c,v 1.1 2006/08/15 12:20:59 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_time.c,v 1.2 2006/12/20 20:17:34 jkim Exp $"); #if 0 __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $"); #endif ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux.h,v 1.70 2006/10/15 14:22:13 netchild Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.72 2006/12/20 20:17:35 jkim Exp $ */ #ifndef _I386_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.82 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.89 2006/12/20 20:42:58 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.82 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.82 2006/12/20 20:42:58 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.82 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.89 2006/12/20 20:42:58 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp */ #include ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#13 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.82 2006/10/28 10:59:59 netchild Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/kern/kern_mac.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.123 2006/10/22 11:52:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.124 2006/12/20 20:38:44 rwatson Exp $"); #include "opt_mac.h" @@ -106,6 +106,16 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); +/* + * Labels consist of a indexed set of "slots", which are allocated policies + * as required. The MAC Framework maintains a bitmask of slots allocated so + * far to prevent reuse. Slots cannot be reused, as the MAC Framework + * guarantees that newly allocated slots in labels will be NULL unless + * otherwise initialized, and because we do not have a mechanism to garbage + * collect slots on policy unload. As labeled policies tend to be statically + * loaded during boot, and not frequently unloaded and reloaded, this is not + * generally an issue. + */ #if MAC_MAX_SLOTS > 32 #error "MAC_MAX_SLOTS too large" #endif @@ -123,15 +133,18 @@ int mac_late = 0; /* - * Flag to indicate whether or not we should allocate label storage for - * new mbufs. Since most dynamic policies we currently work with don't - * rely on mbuf labeling, try to avoid paying the cost of mtag allocation - * unless specifically notified of interest. One result of this is - * that if a dynamically loaded policy requests mbuf labels, it must - * be able to deal with a NULL label being returned on any mbufs that - * were already in flight when the policy was loaded. Since the policy - * already has to deal with uninitialized labels, this probably won't - * be a problem. Note: currently no locking. Will this be a problem? + * Flag to indicate whether or not we should allocate label storage for new + * mbufs. Since most dynamic policies we currently work with don't rely on + * mbuf labeling, try to avoid paying the cost of mtag allocation unless + * specifically notified of interest. One result of this is that if a + * dynamically loaded policy requests mbuf labels, it must be able to deal + * with a NULL label being returned on any mbufs that were already in flight + * when the policy was loaded. Since the policy already has to deal with + * uninitialized labels, this probably won't be a problem. Note: currently + * no locking. Will this be a problem? + * + * In the future, we may want to allow objects to request labeling on a per- + * object type basis, rather than globally for all objects. */ #ifndef MAC_ALWAYS_LABEL_MBUF int mac_labelmbufs = 0; @@ -143,22 +156,31 @@ MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); /* - * mac_static_policy_list holds a list of policy modules that are not - * loaded while the system is "live", and cannot be unloaded. These - * policies can be invoked without holding the busy count. + * mac_static_policy_list holds a list of policy modules that are not loaded + * while the system is "live", and cannot be unloaded. These policies can be + * invoked without holding the busy count. * * mac_policy_list stores the list of dynamic policies. A busy count is - * maintained for the list, stored in mac_policy_busy. The busy count - * is protected by mac_policy_mtx; the list may be modified only - * while the busy count is 0, requiring that the lock be held to - * prevent new references to the list from being acquired. For almost - * all operations, incrementing the busy count is sufficient to - * guarantee consistency, as the list cannot be modified while the - * busy count is elevated. For a few special operations involving a - * change to the list of active policies, the mtx itself must be held. - * A condition variable, mac_policy_cv, is used to signal potential - * exclusive consumers that they should try to acquire the lock if a - * first attempt at exclusive access fails. + * maintained for the list, stored in mac_policy_busy. The busy count is + * protected by mac_policy_mtx; the list may be modified only while the busy + * count is 0, requiring that the lock be held to prevent new references to + * the list from being acquired. For almost all operations, incrementing the + * busy count is sufficient to guarantee consistency, as the list cannot be + * modified while the busy count is elevated. For a few special operations + * involving a change to the list of active policies, the mtx itself must be + * held. A condition variable, mac_policy_cv, is used to signal potential + * exclusive consumers that they should try to acquire the lock if a first + * attempt at exclusive access fails. + * + * This design intentionally avoids fairness, and may starve attempts to + * acquire an exclusive lock on a busy system. This is required because we + * do not ever want acquiring a read reference to perform an unbounded length + * sleep. Read references are acquired in ithreads, network isrs, etc, and + * any unbounded blocking could lead quickly to deadlock. + * + * Another reason for never blocking on read references is that the MAC + * Framework may recurse: if a policy calls a VOP, for example, this might + * lead to vnode life cycle operations (such as init/destroy). */ #ifndef MAC_STATIC static struct mtx mac_policy_mtx; @@ -169,13 +191,12 @@ struct mac_policy_list_head mac_static_policy_list; /* - * We manually invoke WITNESS_WARN() to allow Witness to generate - * warnings even if we don't end up ever triggering the wait at - * run-time. The consumer of the exclusive interface must not hold - * any locks (other than potentially Giant) since we may sleep for - * long (potentially indefinite) periods of time waiting for the - * framework to become quiescent so that a policy list change may - * be made. + * We manually invoke WITNESS_WARN() to allow Witness to generate warnings + * even if we don't end up ever triggering the wait at run-time. The + * consumer of the exclusive interface must not hold any locks (other than + * potentially Giant) since we may sleep for long (potentially indefinite) + * periods of time waiting for the framework to become quiescent so that a + * policy list change may be made. */ void mac_policy_grab_exclusive(void) @@ -296,9 +317,9 @@ } /* - * For the purposes of modules that want to know if they were loaded - * "early", set the mac_late flag once we've processed modules either - * linked into the kernel, or loaded before the kernel startup. + * For the purposes of modules that want to know if they were loaded "early", + * set the mac_late flag once we've processed modules either linked into the + * kernel, or loaded before the kernel startup. */ static void mac_late_init(void) @@ -310,8 +331,8 @@ /* * After the policy list has changed, walk the list to update any global * flags. Currently, we support only one flag, and it's conditionally - * defined; as a result, the entire function is conditional. Eventually, - * the #else case might also iterate across the policies. + * defined; as a result, the entire function is conditional. Eventually, the + * #else case might also iterate across the policies. */ static void mac_policy_updateflags(void) @@ -390,16 +411,16 @@ error = 0; /* - * We don't technically need exclusive access while !mac_late, - * but hold it for assertion consistency. + * We don't technically need exclusive access while !mac_late, but + * hold it for assertion consistency. */ mac_policy_grab_exclusive(); /* - * If the module can potentially be unloaded, or we're loading - * late, we have to stick it in the non-static list and pay - * an extra performance overhead. Otherwise, we can pay a - * light locking cost and stick it in the static list. + * If the module can potentially be unloaded, or we're loading late, + * we have to stick it in the non-static list and pay an extra + * performance overhead. Otherwise, we can pay a light locking cost + * and stick it in the static list. */ static_entry = (!mac_late && !(mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK)); @@ -432,18 +453,23 @@ mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; /* - * If we're loading a MAC module after the framework has - * initialized, it has to go into the dynamic list. If - * we're loading it before we've finished initializing, - * it can go into the static list with weaker locker - * requirements. + * If we're loading a MAC module after the framework has initialized, + * it has to go into the dynamic list. If we're loading it before + * we've finished initializing, it can go into the static list with + * weaker locker requirements. */ if (static_entry) LIST_INSERT_HEAD(&mac_static_policy_list, mpc, mpc_list); else LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); - /* Per-policy initialization. */ + /* + * Per-policy initialization. Currently, this takes place under the + * exclusive lock, so policies must not sleep in their init method. + * In the future, we may want to separate "init" from "start", with + * "init" occuring without the lock held. Likewise, on tear-down, + * breaking out "stop" from "destroy". + */ if (mpc->mpc_ops->mpo_init != NULL) (*(mpc->mpc_ops->mpo_init))(mpc); mac_policy_updateflags(); @@ -461,9 +487,8 @@ { /* - * If we fail the load, we may get a request to unload. Check - * to see if we did the run-time registration, and if not, - * silently succeed. + * If we fail the load, we may get a request to unload. Check to see + * if we did the run-time registration, and if not, silently succeed. */ mac_policy_grab_exclusive(); if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) == 0) { @@ -480,8 +505,8 @@ } #endif /* - * Only allow the unload to proceed if the module is unloadable - * by its own definition. + * Only allow the unload to proceed if the module is unloadable by + * its own definition. */ if ((mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK) == 0) { mac_policy_release_exclusive(); @@ -710,8 +735,8 @@ p->p_ucred = newcred; /* - * Grab additional reference for use while revoking mmaps, prior - * to releasing the proc lock and sharing the cred. + * Grab additional reference for use while revoking mmaps, prior to + * releasing the proc lock and sharing the cred. */ crhold(newcred); PROC_UNLOCK(p); ==== //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#6 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.76 2006/12/13 06:00:56 csjp Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.77 2006/12/20 20:43:19 rwatson Exp $ */ /* @@ -89,7 +89,6 @@ /* * Kernel functions to manage and evaluate labels. */ - void mac_init_bpfdesc(struct bpf_d *); void mac_init_cred(struct ucred *); void mac_init_devfsdirent(struct devfs_dirent *); @@ -135,8 +134,8 @@ void mac_vnode_label_free(struct label *label); /* - * Labeling event operations: file system objects, and things that - * look a lot like file system objects. + * Labeling event operations: file system objects, and things that look a lot + * like file system objects. */ void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); @@ -186,7 +185,6 @@ */ void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); - /* * Labeling event operations: network objects. */ @@ -208,12 +206,12 @@ void mac_reflect_mbuf_tcp(struct mbuf *m); void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); - void mac_create_mbuf_from_firewall(struct mbuf *m); void mac_destroy_syncache(struct label **label); int mac_init_syncache(struct label **label); void mac_init_syncache_from_inpcb(struct label *label, struct inpcb *inp); void mac_create_mbuf_from_syncache(struct label *sc_label, struct mbuf *m); + /* * Labeling event operations: processes. */ @@ -230,20 +228,24 @@ void mac_thread_userret(struct thread *td); /* - * Label cleanup operation: This is the inverse complement for the - * mac_create and associate type of hooks. This hook lets the policy - * module(s) perform a cleanup/flushing operation on the label - * associated with the objects, without freeing up the space allocated. - * This hook is useful in cases where it is desirable to remove any - * labeling reference when recycling any object to a pool. This hook - * does not replace the mac_destroy hooks. + * Label cleanup operation: This is the inverse complement for the mac_create + * and associate type of hooks. This hook lets the policy module(s) perform a + * cleanup/flushing operation on the label associated with the objects, + * without freeing up the space allocated. This hook is useful in cases + * where it is desirable to remove any labeling reference when recycling any + * object to a pool. This hook does not replace the mac_destroy hooks. + * + * XXXRW: These object methods are inconsistent with the life cycles of other + * objects, and likely should be revised to be more consistent. */ void mac_cleanup_sysv_msgmsg(struct msg *msgptr); void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); -/* Access control checks. */ +/* + * Access control checks. + */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); @@ -415,8 +417,8 @@ int mac_priv_grant(struct ucred *cred, int priv); /* - * Calls to help various file systems implement labeling functionality - * using their existing EA implementation. + * Calls to help various file systems implement labeling functionality using + * their existing EA implementation. */ int vop_stdsetlabel_ea(struct vop_setlabel_args *ap); ==== //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.120 2006/11/06 13:42:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.121 2006/12/20 20:40:29 rwatson Exp $"); #include "opt_mac.h" @@ -426,8 +426,8 @@ MAC_IFNET_LOCK(ifnet); mac_copy_ifnet_label(ifnet->if_label, intlabel); MAC_IFNET_UNLOCK(ifnet); - error = mac_externalize_ifnet_label(ifnet->if_label, elements, - buffer, mac.m_buflen); + error = mac_externalize_ifnet_label(intlabel, elements, buffer, + mac.m_buflen); mac_ifnet_label_free(intlabel); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); ==== //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.5 2006/12/17 02:04:18 kmacy Exp $ + * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.6 2006/12/20 20:18:07 kmacy Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -74,7 +74,7 @@ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[11]; + uint64_t pad[10]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned From owner-p4-projects@FreeBSD.ORG Thu Dec 21 23:01:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FFBE16A47E; Thu, 21 Dec 2006 23:01:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8AF716A403 for ; Thu, 21 Dec 2006 23:01:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F54F13C45F for ; Thu, 21 Dec 2006 23:01:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBLN1Le6048298 for ; Thu, 21 Dec 2006 23:01:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLN1LPN048292 for perforce@freebsd.org; Thu, 21 Dec 2006 23:01:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 21 Dec 2006 23:01:21 GMT Message-Id: <200612212301.kBLN1LPN048292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2006 23:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=112041 Change 112041 by hselasky@hselasky_mini_itx on 2006/12/21 23:01:07 Sync with old EHCI driver: Add more PCI ID's. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#10 (text+ko) ==== @@ -72,10 +72,12 @@ #define PCI_EHCI_VENDORID_ACERLABS 0x10b9 #define PCI_EHCI_VENDORID_AMD 0x1022 #define PCI_EHCI_VENDORID_APPLE 0x106b +#define PCI_EHCI_VENDORID_ATI 0x1002 #define PCI_EHCI_VENDORID_CMDTECH 0x1095 #define PCI_EHCI_VENDORID_INTEL 0x8086 #define PCI_EHCI_VENDORID_NEC 0x1033 #define PCI_EHCI_VENDORID_OPTI 0x1045 +#define PCI_EHCI_VENDORID_PHILIPS 0x1131 #define PCI_EHCI_VENDORID_SIS 0x1039 #define PCI_EHCI_VENDORID_NVIDIA 0x12D2 #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE @@ -132,8 +134,45 @@ { u_int32_t device_id = pci_get_devid(self); + if (device_id == 0x523910b9) + return "ALi M5239 USB 2.0 controller"; + + if (device_id == 0x10227463) + return "AMD 8111 USB 2.0 controller"; + + if (device_id == 0x43451002) + return "ATI SB200 USB 2.0 controller"; + if (device_id == 0x43731002) + return "ATI SB400 USB 2.0 controller"; + + if (device_id == 0x25ad8086) + return "Intel 6300ESB USB 2.0 controller"; + if (device_id == 0x24cd8086) + return "Intel 82801DB/L/M (ICH4) USB 2.0 controller"; + if (device_id == 0x24dd8086) + return "Intel 82801EB/R (ICH5) USB 2.0 controller"; + if (device_id == 0x265c8086) + return "Intel 82801FB (ICH6) USB 2.0 controller"; + if (device_id == 0x27cc8086) + return "Intel 82801GB/R (ICH7) USB 2.0 controller"; + if(device_id == 0x00e01033) { return ("NEC uPD 720100 USB 2.0 controller"); } + + if (device_id == 0x006810de) + return "NVIDIA nForce2 USB 2.0 controller"; + if (device_id == 0x008810de) + return "NVIDIA nForce2 Ultra 400 USB 2.0 controller"; + if (device_id == 0x00d810de) + return "NVIDIA nForce3 USB 2.0 controller"; + if (device_id == 0x00e810de) + return "NVIDIA nForce3 250 USB 2.0 controller"; + if (device_id == 0x005b10de) + return "NVIDIA nForce4 USB 2.0 controller"; + + if (device_id == 0x15621131) + return "Philips ISP156x USB 2.0 controller"; + if(device_id == 0x31041106) { return ("VIA VT6202 USB 2.0 controller"); } @@ -257,6 +296,9 @@ case PCI_EHCI_VENDORID_APPLE: sprintf(sc->sc_vendor, "Apple"); break; + case PCI_EHCI_VENDORID_ATI: + sprintf(sc->sc_vendor, "ATI"); + break; case PCI_EHCI_VENDORID_CMDTECH: sprintf(sc->sc_vendor, "CMDTECH"); break; @@ -269,6 +311,9 @@ case PCI_EHCI_VENDORID_OPTI: sprintf(sc->sc_vendor, "OPTi"); break; + case PCI_EHCI_VENDORID_PHILIPS: + sprintf(sc->sc_vendor, "Philips"); + break; case PCI_EHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break; From owner-p4-projects@FreeBSD.ORG Thu Dec 21 23:16:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17A0816A40F; Thu, 21 Dec 2006 23:16:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C75F816A403 for ; Thu, 21 Dec 2006 23:16:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B79FB13C41A for ; Thu, 21 Dec 2006 23:16:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBLNGeGu052531 for ; Thu, 21 Dec 2006 23:16:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLNGeQl052526 for perforce@freebsd.org; Thu, 21 Dec 2006 23:16:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 21 Dec 2006 23:16:40 GMT Message-Id: <200612212316.kBLNGeQl052526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2006 23:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=112042 Change 112042 by hselasky@hselasky_mini_itx on 2006/12/21 23:16:20 Sync ohci_pci.c with old version: Add more PCI ID's. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#10 (text+ko) ==== @@ -69,12 +69,14 @@ #define PCI_OHCI_VENDORID_ACERLABS 0x10b9 #define PCI_OHCI_VENDORID_AMD 0x1022 #define PCI_OHCI_VENDORID_APPLE 0x106b +#define PCI_OHCI_VENDORID_ATI 0x1002 #define PCI_OHCI_VENDORID_CMDTECH 0x1095 #define PCI_OHCI_VENDORID_NEC 0x1033 #define PCI_OHCI_VENDORID_NVIDIA 0x12D2 #define PCI_OHCI_VENDORID_NVIDIA2 0x10DE #define PCI_OHCI_VENDORID_OPTI 0x1045 #define PCI_OHCI_VENDORID_SIS 0x1039 +#define PCI_OHCI_VENDORID_SUN 0x108e #define PCI_OHCI_BASE_REG 0x10 @@ -132,6 +134,12 @@ { return ("AMD-756 USB Controller"); } if(device_id == 0x74141022) { return ("AMD-766 USB Controller"); } + + if (device_id == 0x43741002) + return "ATI SB400 USB Controller"; + if (device_id == 0x43751002) + return "ATI SB400 USB Controller"; + if(device_id == 0x06701095) { return ("CMD Tech 670 (USB0670) USB controller"); } if(device_id == 0x06731095) @@ -144,6 +152,10 @@ { return ("nVidia nForce3 USB Controller"); } if(device_id == 0x70011039) { return ("SiS 5571 USB controller"); } + + if (device_id == 0x1103108e) + return "Sun PCIO-2 USB controller"; + if(device_id == 0x0019106b) { return ("Apple KeyLargo USB controller"); } @@ -252,6 +264,9 @@ case PCI_OHCI_VENDORID_APPLE: sprintf(sc->sc_vendor, "Apple"); break; + case PCI_OHCI_VENDORID_ATI: + sprintf(sc->sc_vendor, "ATI"); + break; case PCI_OHCI_VENDORID_CMDTECH: sprintf(sc->sc_vendor, "CMDTECH"); break; @@ -268,6 +283,9 @@ case PCI_OHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break; + case PCI_OHCI_VENDORID_SUN: + sprintf(sc->sc_vendor, "SUN"); + break; default: if(bootverbose) { From owner-p4-projects@FreeBSD.ORG Thu Dec 21 23:55:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6764A16A542; Thu, 21 Dec 2006 23:55:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 262B016A52F for ; Thu, 21 Dec 2006 23:55:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 15A1713C434 for ; Thu, 21 Dec 2006 23:55:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBLNtTf4058868 for ; Thu, 21 Dec 2006 23:55:29 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLNtTA5058865 for perforce@freebsd.org; Thu, 21 Dec 2006 23:55:29 GMT (envelope-from marcel@freebsd.org) Date: Thu, 21 Dec 2006 23:55:29 GMT Message-Id: <200612212355.kBLNtTA5058865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 112045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2006 23:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=112045 Change 112045 by marcel@marcel_nfs on 2006/12/21 23:55:24 o Flesh out cpu_mp_announce() o Add cpu_mp_unleash() Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#4 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#7 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#4 (text+ko) ==== @@ -39,7 +39,8 @@ #define PCPU_MD_FIELDS \ int pc_inside_intr; \ struct pmap *pc_curpmap; /* current pmap */ \ - struct thread *pc_fputhread; /* current fpu user */ \ + struct thread *pc_fputhread; /* current fpu user */ \ + int pc_awake:1; \ register_t pc_tempsave[CPUSAVE_LEN]; \ register_t pc_disisave[CPUSAVE_LEN]; \ register_t pc_dbsave[CPUSAVE_LEN]; ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#7 (text+ko) ==== @@ -37,6 +37,11 @@ #include +volatile static int ap_awake; +volatile static int ap_spin; + +int mp_ipi_test = 0; + void cpu_mp_setmaxid(void) { @@ -93,9 +98,58 @@ void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + for (i = 0; i <= mp_maxid; i++) { + pc = pcpu_find(i); + if (pc == NULL) + continue; + printf("cpu%d", i); + if (i == 0) + printf(" (BSP)"); + printf("\n"); + } } static void +cpu_mp_unleash(void *dummy) +{ + struct pcpu *pc; + int cpus; + + if (mp_ncpus <= 1) + return; + + if (mp_ipi_test != 1) + printf("SMP: WARNING: sending of a test IPI failed\n"); + + cpus = 0; + smp_cpus = 0; + SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { + cpus++; + if (pc->pc_awake) + smp_cpus++; + } + + ap_awake = 1; + ap_spin = 0; + + while (ap_awake != smp_cpus) + DELAY(0); + + if (smp_cpus != cpus || cpus != mp_ncpus) { + printf("SMP: %d CPUs found; %d CPUs usable; %d CPUs woken\n", + mp_ncpus, cpus, smp_cpus); + } + + smp_active = 1; + smp_started = 1; +} + +SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); + +static void ipi_send(struct pcpu *pc, int ipi) { } @@ -142,4 +196,3 @@ ipi_send(pcpup, ipi); } - From owner-p4-projects@FreeBSD.ORG Fri Dec 22 00:00:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2666D16A415; Fri, 22 Dec 2006 00:00:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B902A16A40F for ; Fri, 22 Dec 2006 00:00:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 33FB513C44B for ; Fri, 22 Dec 2006 00:00:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBM00c4d059083 for ; Fri, 22 Dec 2006 00:00:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBM00ciZ059064 for perforce@freebsd.org; Fri, 22 Dec 2006 00:00:38 GMT (envelope-from marcel@freebsd.org) Date: Fri, 22 Dec 2006 00:00:38 GMT Message-Id: <200612220000.kBM00ciZ059064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 112046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Dec 2006 00:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=112046 Change 112046 by marcel@marcel_nfs on 2006/12/22 00:00:02 Avoid hanging on an insanity. The insanity exists because the current implementation is incomplete. Affected files ... .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#8 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#8 (text+ko) ==== @@ -135,7 +135,7 @@ ap_awake = 1; ap_spin = 0; - while (ap_awake != smp_cpus) + while (ap_awake < smp_cpus) DELAY(0); if (smp_cpus != cpus || cpus != mp_ncpus) { From owner-p4-projects@FreeBSD.ORG Fri Dec 22 13:57:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A8DF16A407; Fri, 22 Dec 2006 13:57:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60E8916A47B for ; Fri, 22 Dec 2006 13:57:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4EEF613C462 for ; Fri, 22 Dec 2006 13:57:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBMDvUdk031864 for ; Fri, 22 Dec 2006 13:57:30 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBMDvNvt031861 for perforce@freebsd.org; Fri, 22 Dec 2006 13:57:23 GMT (envelope-from piso@freebsd.org) Date: Fri, 22 Dec 2006 13:57:23 GMT Message-Id: <200612221357.kBMDvNvt031861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Dec 2006 13:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=112059 Change 112059 by piso@piso_newluxor on 2006/12/22 13:56:33 IFC@112058 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#13 integrate .. //depot/projects/soc2005/libalias/bin/domainname/domainname.1#2 integrate .. //depot/projects/soc2005/libalias/bin/test/test.1#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/abi#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2005/libalias/etc/snmpd.config#3 integrate .. //depot/projects/soc2005/libalias/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/soc2005/libalias/include/unistd.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libelf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_cap.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_move.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_syminfo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_align.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_fsize.m4#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_msize.m4#2 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/ia64/include/pthread_md.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/powerpc/include/pthread_md.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#6 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/shared/ggate.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#7 integrate .. //depot/projects/soc2005/libalias/share/man/man4/aac.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/audit.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/auditpipe.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bce.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fast_ipsec.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fdc.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/iic.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/inet.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipmi.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/joy.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/lmc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/padlock.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_tag.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/pty.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/syscons.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/watchdog.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/elf.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/soc2005/libalias/share/man/man7/build.7#3 integrate .. //depot/projects/soc2005/libalias/share/man/man7/development.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man7/environ.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#7 integrate .. //depot/projects/soc2005/libalias/share/man/man9/bus_dma.9#5 integrate .. //depot/projects/soc2005/libalias/share/man/man9/config_intrhook.9#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/crypto.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/ifnet.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/priv.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/socket.9#1 branch .. //depot/projects/soc2005/libalias/share/man/man9/sysctl.9#5 integrate .. //depot/projects/soc2005/libalias/share/man/man9/usbdi.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/utopia.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/watchdog.9#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/boot0spi/main.c#5 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac.c#6 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#10 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.arm#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.i386#9 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.pc98#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.powerpc#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sparc64#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sun4v#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/md/md.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/rgephy.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/exception.s#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/trap.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/icu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_clock.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mac.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_synch.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thread.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_export.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#11 integrate .. //depot/projects/soc2005/libalias/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#32 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#18 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#26 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_util.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mmu_oea.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/soc2005/libalias/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hcall.S#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac_policy.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/mount.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/mouse.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mutex.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#12 integrate .. //depot/projects/soc2005/libalias/sys/sys/pcpu.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysent.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/umtx.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/watchdog.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/cmp/cmp.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/column/column.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/fold/fold.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/from/from.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/mkfifo/mkfifo.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tcopy/tcopy.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truncate/truncate.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/w/w.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/asf/asf.8#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/asf/asf.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#13 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20061214: + Support for PCI Message Signalled Interrupts has been + disabled again in the bge driver. Many revisions of the + hardware fail to support it properly. Support can be + re-enabled by removing the #define of BGE_DISABLE_MSI in + "src/sys/dev/bge/if_bge.c". + +20061214: + Support for PCI Message Signalled Interrupts has been added + to the bge driver. If there are any problems, MSI can be + disabled completely by setting the 'hw.pci.enable_msi' and + 'hw.pci.enable_msix' tunables to 0 in the loader. + 20061205: The removal of several facets of the experimental Threading system from the kernel means that the proc and thread structures @@ -682,4 +695,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ +$FreeBSD: src/UPDATING,v 1.469 2006/12/15 00:30:37 jdp Exp $ ==== //depot/projects/soc2005/libalias/bin/domainname/domainname.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.18 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.19 2006/12/18 15:45:01 ru Exp $ .\" .Dd September 18, 1994 .Dt DOMAINNAME 1 @@ -48,7 +48,7 @@ .Pa /etc/rc.network , normally run at boot time. -.Sh NOTA BENE +.Sh NOTES The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons) domain name does not necessarily have anything to do with the Domain Name System domain name, although they are often set equal for administrative ==== //depot/projects/soc2005/libalias/bin/test/test.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -50,7 +50,9 @@ utility evaluates the expression and, if it evaluates to true, returns a zero (true) exit status; otherwise it returns 1 (false). -If there is no expression, test also +If there is no expression, +.Nm +also returns 1 (false). .Pp All operators and flags are separate arguments to the @@ -187,68 +189,68 @@ .Ar string is not the null string. -.It Ar \&s\&1 Cm \&= Ar \&s\&2 +.It Ar s1 Cm = Ar s2 True if the strings -.Ar \&s\&1 +.Ar s1 and -.Ar \&s\&2 +.Ar s2 are identical. -.It Ar \&s\&1 Cm \&!= Ar \&s\&2 +.It Ar s1 Cm != Ar s2 True if the strings -.Ar \&s\&1 +.Ar s1 and -.Ar \&s\&2 +.Ar s2 are not identical. -.It Ar \&s\&1 Cm \&< Ar \&s\&2 +.It Ar s1 Cm < Ar s2 True if string -.Ar \&s\&1 +.Ar s1 comes before -.Ar \&s\&2 +.Ar s2 based on the binary value of their characters. -.It Ar \&s\&1 Cm \&> Ar \&s\&2 +.It Ar s1 Cm > Ar s2 True if string -.Ar \&s\&1 +.Ar s1 comes after -.Ar \&s\&2 +.Ar s2 based on the binary value of their characters. -.It Ar \&n\&1 Fl \&eq Ar \&n\&2 +.It Ar n1 Fl eq Ar n2 True if the integers -.Ar \&n\&1 +.Ar n1 and -.Ar \&n\&2 +.Ar n2 are algebraically equal. -.It Ar \&n\&1 Fl \&ne Ar \&n\&2 +.It Ar n1 Fl ne Ar n2 True if the integers -.Ar \&n\&1 +.Ar n1 and -.Ar \&n\&2 +.Ar n2 are not algebraically equal. -.It Ar \&n\&1 Fl \> Ar \&n\&2 +.It Ar n1 Fl gt Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically greater than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&ge Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl ge Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically greater than or equal to the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \< Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl lt Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically less than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&le Ar \&n\&2 +.Ar n2 . +.It Ar n1 Fl le Ar n2 True if the integer -.Ar \&n\&1 +.Ar n1 is algebraically less than or equal to the integer -.Ar \&n\&2 . +.Ar n2 . .El .Pp If @@ -312,7 +314,7 @@ The .Nm utility exits with one of the following values: -.Bl -tag -width Ds +.Bl -tag -width indent .It 0 expression evaluated to true. .It 1 ==== //depot/projects/soc2005/libalias/etc/rc.d/abi#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.9 2006/06/21 09:53:25 yar Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.10 2006/12/20 11:37:15 yar Exp $ # # PROVIDE: abi @@ -10,8 +10,8 @@ . /etc/rc.subr name="abi" -start_precmd="${name}_prestart" -start_cmd=":" +start_cmd="${name}_start" +stop_cmd=":" sysv_start() { @@ -41,7 +41,7 @@ load_kld -m svr4elf svr4 } -abi_prestart() +abi_start() { echo -n 'Additional ABI support:' ==== //depot/projects/soc2005/libalias/etc/rc.d/syscons#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/syscons,v 1.17 2006/05/17 09:33:06 phk Exp $ +# $FreeBSD: src/etc/rc.d/syscons,v 1.18 2006/12/20 12:59:50 yar Exp $ # # PROVIDE: syscons @@ -38,6 +38,7 @@ setkeyboard_cmd="syscons_setkeyboard" start_precmd="syscons_precmd" start_cmd="syscons_start" +stop_cmd=":" # stdin must be redirected because it might be for a serial console # ==== //depot/projects/soc2005/libalias/etc/snmpd.config#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/snmpd.config,v 1.7 2006/10/31 10:23:28 harti Exp $ +# $FreeBSD: src/etc/snmpd.config,v 1.8 2006/12/20 22:10:34 syrinx Exp $ # # Example configuration file for bsnmpd(1). # @@ -88,3 +88,9 @@ # This requires the mibII module. # #begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so" + +# +# Bridge module +# This requires the mibII module. +# +#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so" ==== //depot/projects/soc2005/libalias/include/arpa/nameser_compat.h#2 (text+ko) ==== @@ -32,8 +32,8 @@ /* * from nameser.h 8.1 (Berkeley) 6/2/93 - * $Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $ - * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.5 2006/03/21 16:11:11 ume Exp $ + * $Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $ + * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.6 2006/12/15 20:59:55 ume Exp $ */ #ifndef _ARPA_NAMESER_COMPAT_ ==== //depot/projects/soc2005/libalias/include/unistd.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.79 2005/12/02 02:36:13 davidxu Exp $ + * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $ */ #ifndef _UNISTD_H_ @@ -294,6 +294,9 @@ #define _SC_NPROCESSORS_ONLN 58 #endif +/* Extensions found in Solaris and Linux. */ +#define _SC_PHYS_PAGES 121 + /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 #define _CS_PATH 1 /* default value of PATH */ ==== //depot/projects/soc2005/libalias/lib/libc/gen/sysconf.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.21 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.24 2006/12/14 14:34:55 pjd Exp $ .\" -.Dd June 18, 2001 +.Dd December 14, 2006 .Dt SYSCONF 3 .Os .Sh NAME @@ -89,6 +89,8 @@ The number of processors currently online. .It Li _SC_OPEN_MAX The maximum number of open files per user id. +.It Li _SC_PAGESIZE +The size of a system page in bytes. .It Li _SC_STREAM_MAX The minimum maximum number of streams that a process may have open at any one time. @@ -165,6 +167,19 @@ Return 1 if the system supports the User Portability Utilities Option, otherwise \-1. .El +.Pp +These values also exist, but may not be standard: +.Pp +.Bl -tag -width 6n +.Pp +.It Li _SC_PHYS_PAGES +The number of pages of physical memory. +Note that it is possible that the product of this value and the value of +.Li _SC_PAGESIZE +will overflow a +.Vt long +in some configurations on a 32bit machine. +.El .Sh RETURN VALUES If the call to .Fn sysconf ==== //depot/projects/soc2005/libalias/lib/libc/gen/sysconf.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.23 2006/12/14 22:14:14 imp Exp $"); #include #include @@ -79,9 +79,11 @@ int mib[2], sverrno, value; long defaultresult; const char *path; + const char *sname; len = sizeof(value); defaultresult = -1; + sname = NULL; switch (name) { case _SC_ARG_MAX: @@ -574,9 +576,22 @@ mib[1] = HW_NCPU; break; +#ifdef _SC_PHYS_PAGES + case _SC_PHYS_PAGES: + sname = "hw.availpages"; + break; +#endif + default: errno = EINVAL; return (-1); } - return (sysctl(mib, 2, &value, &len, NULL, 0) == -1 ? -1 : value); + if (sname == NULL) { + if (sysctl(mib, 2, &value, &len, NULL, 0) == -1) + value = -1; + } else { + if (sysctlbyname(sname, &value, &len, NULL, 0) == -1) + value = -1; + } + return (value); } ==== //depot/projects/soc2005/libalias/lib/libc/inet/inet_cidr_ntop.c#2 (text) ==== @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.3 2005/11/03 23:08:40 marka Exp $"; +static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.4 2006/10/11 02:32:50 marka Exp $"; #endif #include "port_before.h" @@ -40,10 +40,10 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static char * inet_cidr_ntop_ipv4 __P((const u_char *src, int bits, - char *dst, size_t size)); -static char * inet_cidr_ntop_ipv6 __P((const u_char *src, int bits, - char *dst, size_t size)); +static char * +inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size); +static char * +inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size); /* * char * ==== //depot/projects/soc2005/libalias/lib/libc/inet/inet_net_ntop.c#2 (text) ==== @@ -16,10 +16,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.1 2004/03/09 08:33:32 marka Exp $"; +static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.2 2006/06/20 02:53:07 marka Exp $"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.2 2006/03/21 15:37:15 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.3 2006/12/15 20:59:55 ume Exp $"); #include "port_before.h" @@ -266,7 +266,7 @@ } } /* Format CIDR /width. */ - SPRINTF((cp, "/%u", bits)); + sprintf(cp, "/%u", bits); if (strlen(outbuf) + 1 > size) goto emsgsize; strcpy(dst, outbuf); ==== //depot/projects/soc2005/libalias/lib/libc/isc/eventlib_p.h#3 (text) ==== @@ -18,8 +18,8 @@ /* eventlib_p.h - private interfaces for eventlib * vix 09sep95 [initial] * - * $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $ - * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.3 2006/09/22 01:52:26 kan Exp $ + * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $ + * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.4 2006/12/15 20:59:55 ume Exp $ */ #ifndef _EVENTLIB_P_H @@ -48,6 +48,8 @@ #define EV_MASK_ALL (EV_READ | EV_WRITE | EV_EXCEPT) #define EV_ERR(e) return (errno = (e), -1) #define OK(x) if ((x) < 0) EV_ERR(errno); else (void)NULL +#define OKFREE(x, y) if ((x) < 0) { FREE((y)); EV_ERR(errno); } \ + else (void)NULL #define NEW(p) if (((p) = memget(sizeof *(p))) != NULL) \ FILL(p); \ ==== //depot/projects/soc2005/libalias/lib/libc/net/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.62 2006/11/06 22:07:47 cognet Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -13,7 +13,8 @@ if_indextoname.c if_nameindex.c if_nametoindex.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ nsdispatch.c nslexer.c nsparser.c nss_compat.c \ - rcmd.c rcmdsh.c recv.c rthdr.c send.c sockatmark.c vars.c + rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ + sockatmark.c vars.c .if ${MK_NS_CACHING} != "no" SRCS+= nscache.c nscachedcli.c ==== //depot/projects/soc2005/libalias/lib/libc/resolv/mtctxres.c#2 (text) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.3 2006/12/15 20:59:55 ume Exp $"); #include #ifdef DO_PTHREADS @@ -118,9 +118,10 @@ */ if (!mt_key_initialized) { static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock(&keylock); - _mtctxres_init(); - pthread_mutex_unlock(&keylock); + if (pthread_mutex_lock(&keylock) == 0) { + _mtctxres_init(); + (void) pthread_mutex_unlock(&keylock); + } } /* ==== //depot/projects/soc2005/libalias/lib/libc/resolv/res_init.c#3 (text) ==== @@ -70,10 +70,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.6 2006/08/30 23:23:01 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.3 2006/08/04 10:21:11 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.4 2006/12/15 20:59:55 ume Exp $"); #include "port_before.h" @@ -243,17 +243,10 @@ if (buf[0] == '+') buf[0] = '.'; cp = strchr(buf, '.'); - if (cp == NULL) { - if (strlcpy(statp->defdname, buf, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } else { - if (strlcpy(statp->defdname, cp+1, - sizeof(statp->defdname)) - >= sizeof(statp->defdname)) - goto freedata; - } + cp = (cp == NULL) ? buf : (cp + 1); + if (strlen(cp) >= sizeof(statp->defdname)) + goto freedata; + strcpy(statp->defdname, cp); } } #endif /* SOLARIS2 */ ==== //depot/projects/soc2005/libalias/lib/libc/resolv/res_send.c#4 (text) ==== @@ -70,10 +70,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $"; +static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.9 2006/10/16 23:00:50 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.4 2006/10/24 14:41:43 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.5 2006/12/15 20:59:55 ume Exp $"); /* * Send query to name server and wait for reply. @@ -313,7 +313,8 @@ highestFD = sysconf(_SC_OPEN_MAX) - 1; #endif - if (statp->nscount == 0) { + /* No name servers or res_init() failure */ + if (statp->nscount == 0 || EXT(statp).ext == NULL) { errno = ESRCH; return (-1); } ==== //depot/projects/soc2005/libalias/lib/libc/stdtime/strftime.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.37 2005/07/31 03:30:44 keramida Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.38 2006/12/19 20:20:39 jmg Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -119,7 +119,7 @@ to represent alternative months names (used standalone, without day mentioned). .It Cm %e -is replaced by the day of month as a decimal number (1-31); single +is replaced by the day of the month as a decimal number (1-31); single digits are preceded by a blank. .It Cm \&%F is equivalent to ==== //depot/projects/soc2005/libalias/lib/libc/sys/chflags.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.2 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.27 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.28 2006/12/15 19:23:27 pjd Exp $ .\" .Dd May 16, 2006 .Dt CHFLAGS 2 @@ -162,6 +162,10 @@ .Dv SF_IMMUTABLE , SF_APPEND , or .Dv SF_NOUNLINK . +.It Bq Er EPERM +User tries to set or remove the +.Dv SF_SNAPSHOT +flag. .It Bq Er EROFS The named file resides on a read-only file system. .It Bq Er EFAULT ==== //depot/projects/soc2005/libalias/lib/libelf/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libelf/Makefile,v 1.3 2006/11/24 06:38:11 ru Exp $ +# $FreeBSD: src/lib/libelf/Makefile,v 1.4 2006/12/18 05:40:01 jkoshy Exp $ LIB= elf @@ -24,16 +24,19 @@ elf_strptr.c \ elf_update.c \ elf_version.c \ + gelf_cap.c \ gelf_checksum.c \ - gelf_fsize.c \ - gelf_getclass.c \ gelf_dyn.c \ gelf_ehdr.c \ + gelf_getclass.c \ + gelf_fsize.c \ + gelf_move.c \ gelf_phdr.c \ gelf_rel.c \ gelf_rela.c \ gelf_shdr.c \ gelf_sym.c \ + gelf_syminfo.c \ gelf_symshndx.c \ gelf_xlate.c \ libelf.c \ @@ -53,16 +56,8 @@ CLEANFILES= ${GENSRCS} CFLAGS+= -I. -I${.CURDIR} -OSRELDATE!= sysctl -n kern.osreldate - SHLIB_MAJOR= 1 -.if ${OSRELDATE} > 700009 -SRCS+= gelf_cap.c \ - gelf_move.c \ - gelf_syminfo.c -.endif - WARNS?= 6 MAN= elf.3 \ @@ -162,4 +157,4 @@ # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: - m4 -D SRCDIR=${.CURDIR} -D OSRELDATE=${OSRELDATE} ${.IMPSRC} > ${.TARGET} + m4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET} ==== //depot/projects/soc2005/libalias/lib/libelf/elf_getshnum.3#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.3 2006/12/16 10:45:43 jkoshy Exp $ .\" .Dd October 31, 2006 >>> TRUNCATED FOR MAIL (1000 lines) <<<