From owner-p4-projects@FreeBSD.ORG Sun Feb 19 00:18: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 C9C0116A423; Sun, 19 Feb 2006 00:18:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70BC816A420 for ; Sun, 19 Feb 2006 00:18:22 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E76F43D46 for ; Sun, 19 Feb 2006 00:18:22 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J0IMje076769 for ; Sun, 19 Feb 2006 00:18:22 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J0ILWv076766 for perforce@freebsd.org; Sun, 19 Feb 2006 00:18:21 GMT (envelope-from wsalamon@computer.org) Date: Sun, 19 Feb 2006 00:18:21 GMT Message-Id: <200602190018.k1J0ILWv076766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 92018 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, 19 Feb 2006 00:18:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92018 Change 92018 by wsalamon@gretsch on 2006/02/19 00:18:08 Remove extraneous blank lines. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#10 (text+ko) ==== @@ -1711,7 +1711,6 @@ int error; AUDIT_ARG(signum, uap->signum); - if ((u_int)uap->signum > _SIG_MAXSIG) return (EINVAL); @@ -1764,7 +1763,6 @@ */ AUDIT_ARG(signum, uap->signum); AUDIT_ARG(pid, uap->pgid); - if ((u_int)uap->signum > _SIG_MAXSIG) return (EINVAL); ==== //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#9 (text+ko) ==== @@ -410,7 +410,6 @@ AUDIT_ARG(cmd, uap->req); AUDIT_ARG(addr, uap->addr); AUDIT_ARG(value, uap->data); - addr = &r; switch (uap->req) { case PT_GETREGS: From owner-p4-projects@FreeBSD.ORG Sun Feb 19 00:22: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 32CDA16A423; Sun, 19 Feb 2006 00:22:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D404216A420 for ; Sun, 19 Feb 2006 00:22:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D91F43D46 for ; Sun, 19 Feb 2006 00:22:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J0MR65077018 for ; Sun, 19 Feb 2006 00:22:27 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J0MR02077015 for perforce@freebsd.org; Sun, 19 Feb 2006 00:22:27 GMT (envelope-from wsalamon@computer.org) Date: Sun, 19 Feb 2006 00:22:27 GMT Message-Id: <200602190022.k1J0MR02077015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 92019 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, 19 Feb 2006 00:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92019 Change 92019 by wsalamon@gretsch on 2006/02/19 00:22:10 Cleanup: line lengths, remove extraneous semi-colon Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include -#include #include #include @@ -694,9 +693,7 @@ fdrop(fp, td); vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); - if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC @@ -1193,7 +1190,6 @@ AUDIT_ARG(mode, mode); AUDIT_ARG(dev, dev); - switch (mode & S_IFMT) { case S_IFCHR: case S_IFBLK: @@ -2544,8 +2540,7 @@ int vfslocked; AUDIT_ARG(mode, mode); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2688,8 +2683,7 @@ int vfslocked; AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2732,8 +2726,7 @@ int vfslocked; AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3198,7 +3191,7 @@ int vfslocked; int error; - AUDIT_ARG(fd, uap->fd);; + AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = fp->f_vnode; From owner-p4-projects@FreeBSD.ORG Sun Feb 19 07:19:54 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 1220616A423; Sun, 19 Feb 2006 07:19:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D972C16A420 for ; Sun, 19 Feb 2006 07:19:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F57F43D49 for ; Sun, 19 Feb 2006 07:19:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J7JrBf007727 for ; Sun, 19 Feb 2006 07:19:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J7Jrsa007719 for perforce@freebsd.org; Sun, 19 Feb 2006 07:19:53 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 07:19:53 GMT Message-Id: <200602190719.k1J7Jrsa007719@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 92027 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, 19 Feb 2006 07:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92027 Change 92027 by imp@imp_plunger on 2006/02/19 07:19:14 Add pio and ssc devices. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#1 add .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#1 add .. //depot/projects/arm/src/sys/arm/conf/KB920X#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#20 (text+ko) ==== @@ -90,3 +90,5 @@ device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: +device at91_ssc +device at91_pio From owner-p4-projects@FreeBSD.ORG Sun Feb 19 07:24:13 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 2E3F216A44C; Sun, 19 Feb 2006 07:24:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D766E16A449 for ; Sun, 19 Feb 2006 07:24:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A4B43D45 for ; Sun, 19 Feb 2006 07:24:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J7OCPn008104 for ; Sun, 19 Feb 2006 07:24:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J7OC55008101 for perforce@freebsd.org; Sun, 19 Feb 2006 07:24:12 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 07:24:12 GMT Message-Id: <200602190724.k1J7OC55008101@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 92028 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, 19 Feb 2006 07:24:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92028 Change 92028 by imp@imp_plunger on 2006/02/19 07:23:11 style nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include -static struct at91pmc_softc { +static struct at91_pmc_softc { bus_space_tag_t sc_st; bus_space_handle_t sc_sh; device_t dev; @@ -53,13 +53,13 @@ uint32_t pllb_init; } *pmc_softc; -struct at91pmc_clock +struct at91_pmc_clock { const char *name; uint32_t hz; - struct at91pmc_clock *parent; + struct at91_pmc_clock *parent; uint32_t pmc_mask; - void (*set_mode)(struct at91pmc_clock *, int); + void (*set_mode)(struct at91_pmc_clock *, int); uint32_t refcnt; unsigned id:2; unsigned primary:1; @@ -67,11 +67,11 @@ unsigned programmable:1; }; -static void at91pmc_set_pllb_mode(struct at91pmc_clock *, int); -static void at91pmc_set_sys_mode(struct at91pmc_clock *, int); -static void at91pmc_set_periph_mode(struct at91pmc_clock *, int); +static void at91_pmc_set_pllb_mode(struct at91_pmc_clock *, int); +static void at91_pmc_set_sys_mode(struct at91_pmc_clock *, int); +static void at91_pmc_set_periph_mode(struct at91_pmc_clock *, int); -static struct at91pmc_clock slck = { +static struct at91_pmc_clock slck = { .name = "slck", // 32,768 Hz slow clock .hz = 32768, .refcnt = 1, @@ -79,7 +79,7 @@ .primary = 1, }; -static struct at91pmc_clock main_ck = { +static struct at91_pmc_clock main_ck = { .name = "main", // Main clock .refcnt = 1, .id = 1, @@ -87,7 +87,7 @@ .pmc_mask = PMC_IER_MOSCS, }; -static struct at91pmc_clock plla = { +static struct at91_pmc_clock plla = { .name = "plla", // PLLA Clock, used for CPU clocking .parent = &main_ck, .refcnt = 1, @@ -97,7 +97,7 @@ .pmc_mask = PMC_IER_LOCKA, }; -static struct at91pmc_clock pllb = { +static struct at91_pmc_clock pllb = { .name = "pllb", // PLLB Clock, used for USB functions .parent = &main_ck, .refcnt = 1, @@ -105,44 +105,44 @@ .primary = 1, .pll = 1, .pmc_mask = PMC_IER_LOCKB, - .set_mode = &at91pmc_set_pllb_mode, + .set_mode = &at91_pmc_set_pllb_mode, }; -static struct at91pmc_clock udpck = { +static struct at91_pmc_clock udpck = { .name = "udpck", .parent = &pllb, .pmc_mask = PMC_SCER_UDP, - .set_mode = at91pmc_set_sys_mode + .set_mode = at91_pmc_set_sys_mode }; -static struct at91pmc_clock uhpck = { +static struct at91_pmc_clock uhpck = { .name = "uhpck", .parent = &pllb, .pmc_mask = PMC_SCER_UHP, - .set_mode = at91pmc_set_sys_mode + .set_mode = at91_pmc_set_sys_mode }; -static struct at91pmc_clock mck = { +static struct at91_pmc_clock mck = { .name = "mck", .pmc_mask = PMC_IER_MCKRDY, .refcnt = 1, }; -static struct at91pmc_clock udc_clk = { +static struct at91_pmc_clock udc_clk = { .name = "udc_clk", .parent = &mck, .pmc_mask = 1 << AT91RM92_IRQ_UDP, - .set_mode = &at91pmc_set_periph_mode + .set_mode = &at91_pmc_set_periph_mode }; -static struct at91pmc_clock ohci_clk = { +static struct at91_pmc_clock ohci_clk = { .name = "ohci_clk", .parent = &mck, .pmc_mask = 1 << AT91RM92_IRQ_UDP, - .set_mode = &at91pmc_set_periph_mode + .set_mode = &at91_pmc_set_periph_mode }; -static struct at91pmc_clock *const clock_list[] = { +static struct at91_pmc_clock *const clock_list[] = { &slck, &main_ck, &plla, @@ -160,22 +160,22 @@ bus_space_write_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off), (val)) static void -at91pmc_set_pllb_mode(struct at91pmc_clock *clk, int on) +at91_pmc_set_pllb_mode(struct at91_pmc_clock *clk, int on) { } static void -at91pmc_set_sys_mode(struct at91pmc_clock *clk, int on) +at91_pmc_set_sys_mode(struct at91_pmc_clock *clk, int on) { } static void -at91pmc_set_periph_mode(struct at91pmc_clock *clk, int on) +at91_pmc_set_periph_mode(struct at91_pmc_clock *clk, int on) { } static int -at91pmc_pll_rate(int freq, uint32_t reg, int is_pllb) +at91_pmc_pll_rate(int freq, uint32_t reg, int is_pllb) { uint32_t mul, div; @@ -193,7 +193,7 @@ } static uint32_t -at91pmc_pll_calc(uint32_t main_freq, uint32_t out_freq) +at91_pmc_pll_calc(uint32_t main_freq, uint32_t out_freq) { uint32_t i, div = 0, mul = 0, diff = 1 << 30; unsigned ret = (out_freq > 155000000) ? 0xbe00 : 0x3e00; @@ -241,7 +241,7 @@ } static void -at91pmc_init_clock(struct at91pmc_softc *sc, int main_clock) +at91_pmc_init_clock(struct at91_pmc_softc *sc, int main_clock) { uint32_t mckr; int freq; @@ -252,8 +252,8 @@ * Initialize the usb clock. This sets up pllb, but disables the * actual clock. */ - sc->pllb_init = at91pmc_pll_calc(main_clock, 48000000 * 2) |0x10000000; - pllb.hz = at91pmc_pll_rate(main_clock, sc->pllb_init, 1); + sc->pllb_init = at91_pmc_pll_calc(main_clock, 48000000 * 2) |0x10000000; + pllb.hz = at91_pmc_pll_rate(main_clock, sc->pllb_init, 1); WR4(PMC_PCDR, (1 << AT91RM92_IRQ_UHP) | (1 << AT91RM92_IRQ_UDP)); WR4(PMC_SCDR, PMC_SCER_UHP | PMC_SCER_UDP); WR4(CKGR_PLLBR, 0); @@ -274,14 +274,14 @@ device_printf(sc->dev, "main clock = %d Hz PLLA = %d Hz CPU %d Hz main %d Hz\n", sc->main_clock_hz, - at91pmc_pll_rate(main_clock, RD4(CKGR_PLLAR), 0), + at91_pmc_pll_rate(main_clock, RD4(CKGR_PLLAR), 0), freq, mck.hz); WR4(PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); } static int -at91pmc_probe(device_t dev) +at91_pmc_probe(device_t dev) { device_set_desc(dev, "PMC"); @@ -289,7 +289,7 @@ } static int -at91pmc_attach(device_t dev) +at91_pmc_attach(device_t dev) { struct at91_softc *sc = device_get_softc(device_get_parent(dev)); @@ -299,22 +299,22 @@ if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, &pmc_softc->sc_sh) != 0) panic("couldn't subregion timer registers"); - at91pmc_init_clock(pmc_softc, 10000000); + at91_pmc_init_clock(pmc_softc, 10000000); return (0); } -static device_method_t at91pmc_methods[] = { - DEVMETHOD(device_probe, at91pmc_probe), - DEVMETHOD(device_attach, at91pmc_attach), +static device_method_t at91_pmc_methods[] = { + DEVMETHOD(device_probe, at91_pmc_probe), + DEVMETHOD(device_attach, at91_pmc_attach), {0, 0}, }; -static driver_t at91pmc_driver = { +static driver_t at91_pmc_driver = { "at91_pmc", - at91pmc_methods, - sizeof(struct at91pmc_softc), + at91_pmc_methods, + sizeof(struct at91_pmc_softc), }; -static devclass_t at91pmc_devclass; +static devclass_t at91_pmc_devclass; -DRIVER_MODULE(at91_pmc, atmelarm, at91pmc_driver, at91pmc_devclass, 0, 0); +DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Sun Feb 19 07:36: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 9E01116A423; Sun, 19 Feb 2006 07:36:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DB3516A420 for ; Sun, 19 Feb 2006 07:36:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24BC643D45 for ; Sun, 19 Feb 2006 07:36:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J7aRPS008592 for ; Sun, 19 Feb 2006 07:36:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J7aRDe008589 for perforce@freebsd.org; Sun, 19 Feb 2006 07:36:27 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 07:36:27 GMT Message-Id: <200602190736.k1J7aRDe008589@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 92029 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, 19 Feb 2006 07:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92029 Change 92029 by imp@imp_plunger on 2006/02/19 07:36:22 Add pmc back Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#21 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#21 (text+ko) ==== @@ -92,3 +92,4 @@ device at91_spi # SPI: device at91_ssc device at91_pio +device at91_pmc From owner-p4-projects@FreeBSD.ORG Sun Feb 19 07:46: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 6187816A423; Sun, 19 Feb 2006 07:46:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 164FC16A422 for ; Sun, 19 Feb 2006 07:46:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C6A943D6B for ; Sun, 19 Feb 2006 07:46:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J7khQ6008976 for ; Sun, 19 Feb 2006 07:46:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J7kh6U008973 for perforce@freebsd.org; Sun, 19 Feb 2006 07:46:43 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 07:46:43 GMT Message-Id: <200602190746.k1J7kh6U008973@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 92030 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, 19 Feb 2006 07:46:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92030 Change 92030 by imp@imp_plunger on 2006/02/19 07:45:44 Use better defines instead of magic constants. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#5 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#5 (text+ko) ==== @@ -206,21 +206,17 @@ int32_t diff1; uint32_t input, mul1; - /* - * PLL input between 1MHz and 32MHz per spec, but lower - * frequences seem necessary in some cases so allow 100K. - */ input = main_freq / i; - if (input < 100000) - continue; - if (input > 32000000) + if (input < PMC_PLL_MIN_IN_FREQ) + break; + if (input > PMC_PLL_MAX_IN_FREQ) continue; mul1 = out_freq / input; - if (mul1 > 2048) + if (mul1 > PMC_PLL_MULT_MAX) continue; - if (mul1 < 2) - goto fail; + if (mul1 < PMC_PLL_MULT_MIN) + break; diff1 = out_freq - input * mul1; if (diff1 < 0) @@ -233,7 +229,7 @@ break; } } - if (i == 256 && diff > (out_freq >> 5)) + if (diff > (out_freq >> PMC_PLL_SHIFT_TOL)) goto fail; return ret | ((mul - 1) << 16) | div; fail: ==== //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#2 (text+ko) ==== @@ -96,4 +96,17 @@ #define PMC_IER_PCK2RDY (1UL << 10) /* Programmable Clock 2 Ready */ #define PMC_IER_PCK3RDY (1UL << 11) /* Programmable Clock 3 Ready */ +/* + * PLL input frequency spec sheet says it must be between 1MHz and 32MHz, + * but it works down as low as 100kHz, a frequency necessary for some + * output frequencies to work. + */ +#define PMC_PLL_MIN_IN_FREQ 100000 +#define PMC_PLL_MAX_IN_FREQ 32000000 + +#define PMC_PLL_MULT_MIN 2 +#define PMC_PLL_MULT_MAX 2048 + +#define PMC_PLL_SHIFT_TOL 5 /* Allow errors 1 part in 32 */ + #endif /* ARM_AT91_AT91_PMCREG_H */ From owner-p4-projects@FreeBSD.ORG Sun Feb 19 08:03:10 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 AE0ED16A423; Sun, 19 Feb 2006 08:03:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 804A516A420 for ; Sun, 19 Feb 2006 08:03:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CD8343D45 for ; Sun, 19 Feb 2006 08:03:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J838OO009529 for ; Sun, 19 Feb 2006 08:03:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J838Pv009526 for perforce@freebsd.org; Sun, 19 Feb 2006 08:03:08 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 08:03:08 GMT Message-Id: <200602190803.k1J838Pv009526@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 92031 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, 19 Feb 2006 08:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=92031 Change 92031 by imp@imp_plunger on 2006/02/19 08:02:58 More constants. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#6 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#6 (text+ko) ==== @@ -196,10 +196,9 @@ at91_pmc_pll_calc(uint32_t main_freq, uint32_t out_freq) { uint32_t i, div = 0, mul = 0, diff = 1 << 30; - unsigned ret = (out_freq > 155000000) ? 0xbe00 : 0x3e00; + unsigned ret = (out_freq > PMC_PLL_FAST_THRESH) ? 0xbe00 : 0x3e00; - /* PLL output max 240 MHz (or 180 MHz per errata) */ - if (out_freq > 240000000) + if (out_freq > PMC_PLL_MAX_OUT_FREQ) goto fail; for (i = 1; i < 256; i++) { ==== //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#3 (text+ko) ==== @@ -104,9 +104,17 @@ #define PMC_PLL_MIN_IN_FREQ 100000 #define PMC_PLL_MAX_IN_FREQ 32000000 +/* + * PLL Max output frequency is 240MHz. The errata says 180MHz is the max + * for some revisions of this part. Be more permissive and optimistic. + */ +#define PMC_PLL_MAX_OUT_FREQ 240000000 + #define PMC_PLL_MULT_MIN 2 #define PMC_PLL_MULT_MAX 2048 #define PMC_PLL_SHIFT_TOL 5 /* Allow errors 1 part in 32 */ +#define PMC_PLL_FAST_THRESH 155000000 + #endif /* ARM_AT91_AT91_PMCREG_H */ From owner-p4-projects@FreeBSD.ORG Sun Feb 19 08:35: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 56EF516A423; Sun, 19 Feb 2006 08:35:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2602016A420 for ; Sun, 19 Feb 2006 08:35:50 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E757443D45 for ; Sun, 19 Feb 2006 08:35:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J8ZnVv011216 for ; Sun, 19 Feb 2006 08:35:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J8Zn97011213 for perforce@freebsd.org; Sun, 19 Feb 2006 08:35:49 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 08:35:49 GMT Message-Id: <200602190835.k1J8Zn97011213@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 92032 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, 19 Feb 2006 08:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92032 Change 92032 by imp@imp_plunger on 2006/02/19 08:35:43 Add PIO Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#7 (text+ko) ==== @@ -287,6 +287,16 @@ /* Disable all interrupts for the SDRAM controller */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff); at91_add_child(dev, 0, "at91_st", 0, 0, 0, 1); + at91_add_child(dev, 0, "at91_pio", 0, AT91RM92_BASE + // PMC + AT91RM92_PIOA_BASE, AT91RM92_PMC_SIZE, 1); + at91_add_child(dev, 0, "at91_pio", 1, AT91RM92_BASE + // PMC + AT91RM92_PIOB_BASE, AT91RM92_PMC_SIZE, 1); + at91_add_child(dev, 0, "at91_pio", 2, AT91RM92_BASE + // PMC + AT91RM92_PIOC_BASE, AT91RM92_PMC_SIZE, 1); + at91_add_child(dev, 0, "at91_pio", 3, AT91RM92_BASE + // PMC + AT91RM92_PIOD_BASE, AT91RM92_PMC_SIZE, 1); + at91_add_child(dev, 3, "at91_pmc", 0, AT91RM92_BASE + // PMC + AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, 1); at91_add_child(dev, 10, "at91_udp", 0, AT91RM92_BASE + // UDP AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); at91_add_child(dev, 10, "at91_mci", 0, AT91RM92_BASE + // MCI From owner-p4-projects@FreeBSD.ORG Sun Feb 19 08:37:54 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 8E08516A424; Sun, 19 Feb 2006 08:37:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49ADE16A420 for ; Sun, 19 Feb 2006 08:37:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3C5543D46 for ; Sun, 19 Feb 2006 08:37:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J8bqZT011293 for ; Sun, 19 Feb 2006 08:37:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J8bqie011290 for perforce@freebsd.org; Sun, 19 Feb 2006 08:37:52 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 08:37:52 GMT Message-Id: <200602190837.k1J8bqie011290@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 92033 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, 19 Feb 2006 08:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92033 Change 92033 by imp@imp_plunger on 2006/02/19 08:37:32 Fix definition for the PMC. I was off by 100 hex. Also, remove the PIO pin definitions, as we'll do this a little differently I think. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#15 (text+ko) ==== @@ -203,8 +203,23 @@ #define PIOD_OWDR (0xa00 + 164) /* Output write disable register */ #define PIOD_OWSR (0xa00 + 168) /* Output write status register */ -#define AT91RM92_PMC_BASE 0xffffd00 -#define AT91RM92_PMC_SIZE 0xc00 +/* + * PIO + */ +#define AT91RM92_PIOA_BASE 0xffff400 +#define AT91RM92_PIOA_SIZE 0x200 +#define AT91RM92_PIOB_BASE 0xffff600 +#define AT91RM92_PIOB_SIZE 0x200 +#define AT91RM92_PIOC_BASE 0xffff800 +#define AT91RM92_PIOC_SIZE 0x200 +#define AT91RM92_PIOD_BASE 0xffffa00 +#define AT91RM92_PIOD_SIZE 0x200 + +/* + * PMC + */ +#define AT91RM92_PMC_BASE 0xffffc00 +#define AT91RM92_PMC_SIZE 0x100 /* IRQs : */ /* @@ -316,321 +331,6 @@ #define AT91RM92_OHCI_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 -/* Pio definitions */ -#define AT91RM92_PIO_PA0 (1 << 0) -#define AT91RM92_PA0_MISO (AT91RM92_PIO_PA0) /* SPI Master In Slave */ -#define AT91RM92_PA0_PCK3 (AT91RM92_PIO_PA0) /* PMC Programmable Clock Output 3 */ -#define AT91RM92_PIO_PA1 (1 << 1) -#define AT91RM92_PA1_MOSI (AT91RM92_PIO_PA1) /* SPI Master Out Slave */ -#define AT91RM92_PA1_PCK0 (AT91RM92_PIO_PA1) /* PMC Programmable Clock Output 0 */ -#define AT91RM92_PIO_PA2 (1 << 2) -#define AT91RM92_PA2_SPCK (AT91RM92_PIO_PA2) /* SPI Serial Clock */ -#define AT91RM92_PA2_IRQ4 (AT91RM92_PIO_PA2) /* AIC Interrupt Input 4 */ -#define AT91RM92_PIO_PA3 (1 << 3) -#define AT91RM92_PA3_NPCS0 (AT91RM92_PIO_PA3) /* SPI Peripheral Chip Select 0 */ -#define AT91RM92_PA3_IRQ5 (AT91RM92_PIO_PA3) /* AIC Interrupt Input 5 */ -#define AT91RM92_PIO_PA4 (1 << 4) -#define AT91RM92_PA4_NPCS1 (AT91RM92_PIO_PA4) /* SPI Peripheral Chip Select 1 */ -#define AT91RM92_PA4_PCK1 (AT91RM92_PIO_PA4) /* PMC Programmable Clock Output 1 */ -#define AT91RM92_PIO_PA5 (1 << 5) -#define AT91RM92_PA5_NPCS2 (AT91RM92_PIO_PA5) /* SPI Peripheral Chip Select 2 */ -#define AT91RM92_PA5_TXD3 (AT91RM92_PIO_PA5) /* USART 3 Transmit Data */ -#define AT91RM92_PIO_PA6 (1 << 6) -#define AT91RM92_PA6_NPCS3 (AT91RM92_PIO_PA6) /* SPI Peripheral Chip Select 3 */ -#define AT91RM92_PA6_RXD3 (AT91RM92_PIO_PA6) /* USART 3 Receive Data */ -#define AT91RM92_PIO_PA7 (1 << 7) -#define AT91RM92_PA7_ETXCK_EREFC (AT91RM92_PIO_PA7) /* Ethernet MAC Transmit Clock/Reference Clock */ -#define AT91RM92_PA7_PCK2 (AT91RM92_PIO_PA7) /* PMC Programmable Clock 2 */ -#define AT91RM92_PIO_PA8 (1 << 8) -#define AT91RM92_PA8_ETXEN (AT91RM92_PIO_PA8) /* Ethernet MAC Transmit Enable */ -#define AT91RM92_PA8_MCCDB (AT91RM92_PIO_PA8) /* Multimedia Card B Command */ -#define AT91RM92_PIO_PA9 (1 << 9) -#define AT91RM92_PA9_ETX0 (AT91RM92_PIO_PA9) /* Ethernet MAC Transmit Data 0 */ -#define AT91RM92_PA9_MCDB0 (AT91RM92_PIO_PA9) /* Multimedia Card B Data 0 */ -#define AT91RM92_PIO_PA10 (1 << 10) -#define AT91RM92_PA10_ETX1 (AT91RM92_PIO_PA10) /* Ethernet MAC Transmit Data 1 */ -#define AT91RM92_PA10_MCDB1 (AT91RM92_PIO_PA10) /* Multimedia Card B Data 1 */ -#define AT91RM92_PIO_PA11 (1 << 11) -#define AT91RM92_PA11_ECRS_ECRSDV (AT91RM92_PIO_PA11) /* Ethernet MAC Carrier Sense/Carrier Sense and Data Valid */ -#define AT91RM92_PA11_MCDB2 (AT91RM92_PIO_PA11) /* Multimedia Card B Data 2 */ -#define AT91RM92_PIO_PA12 (1 << 12) -#define AT91RM92_PA12_ERX0 (AT91RM92_PIO_PA12) /* Ethernet MAC Receive Data 0 */ -#define AT91RM92_PA12_MCDB3 (AT91RM92_PIO_PA12) /* Multimedia Card B Data 3 */ -#define AT91RM92_PIO_PA13 (1 << 13) -#define AT91RM92_PA13_ERX1 (AT91RM92_PIO_PA13) /* Ethernet MAC Receive Data 1 */ -#define AT91RM92_PA13_TCLK0 (AT91RM92_PIO_PA13) /* Timer Counter 0 external clock input */ -#define AT91RM92_PIO_PA14 (1 << 14) -#define AT91RM92_PA14_ERXER (AT91RM92_PIO_PA14) /* Ethernet MAC Receive Error */ -#define AT91RM92_PA14_TCLK1 (AT91RM92_PIO_PA14) /* Timer Counter 1 external clock input */ -#define AT91RM92_PIO_PA15 (1 << 15) -#define AT91RM92_PA15_EMDC (AT91RM92_PIO_PA15) /* Ethernet MAC Management Data Clock */ -#define AT91RM92_PA15_TCLK2 (AT91RM92_PIO_PA15) /* Timer Counter 2 external clock input */ -#define AT91RM92_PIO_PA16 (1 << 16) -#define AT91RM92_PA16_EMDIO (AT91RM92_PIO_PA16) /* Ethernet MAC Management Data Input/Output */ -#define AT91RM92_PA16_IRQ6 (AT91RM92_PIO_PA16) /* AIC Interrupt input 6 */ -#define AT91RM92_PIO_PA17 (1 << 17) -#define AT91RM92_PA17_TXD0 (AT91RM92_PIO_PA17) /* USART 0 Transmit Data */ -#define AT91RM92_PA17_TIOA0 (AT91RM92_PIO_PA17) /* Timer Counter 0 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PA18 (1 << 18) -#define AT91RM92_PA18_RXD0 (AT91RM92_PIO_PA18) /* USART 0 Receive Data */ -#define AT91RM92_PA18_TIOB0 (AT91RM92_PIO_PA18) /* Timer Counter 0 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PA19 (1 << 19) -#define AT91RM92_PA19_SCK0 (AT91RM92_PIO_PA19) /* USART 0 Serial Clock */ -#define AT91RM92_PA19_TIOA1 (AT91RM92_PIO_PA19) /* Timer Counter 1 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PA20 (1 << 20) -#define AT91RM92_PA20_CTS0 (AT91RM92_PIO_PA20) /* USART 0 Clear To Send */ -#define AT91RM92_PA20_TIOB1 (AT91RM92_PIO_PA20) /* Timer Counter 1 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PA21 (1 << 21) -#define AT91RM92_PA21_RTS0 (AT91RM92_PIO_PA21) /* USART 0 Ready To Send */ -#define AT91RM92_PA21_TIOA2 (AT91RM92_PIO_PA21) /* Timer Counter 2 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PA22 (1 << 22) -#define AT91RM92_PA22_RXD2 (AT91RM92_PIO_PA22) /* USART 2 Receive Data */ -#define AT91RM92_PA22_TIOB2 (AT91RM92_PIO_PA22) /* Timer Counter 2 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PA23 (1 << 23) -#define AT91RM92_PA23_TXD2 (AT91RM92_PIO_PA23) /* USART 2 Transmit Data */ -#define AT91RM92_PA23_IRQ3 (AT91RM92_PIO_PA23) /* Interrupt input 3 */ -#define AT91RM92_PIO_PA24 (1 << 24) -#define AT91RM92_PA24_SCK2 (AT91RM92_PIO_PA24) /* USART 2 Serial Clock */ -#define AT91RM92_PA24_PCK1 (AT91RM92_PIO_PA24) /* PMC Programmable Clock Output 1 */ -#define AT91RM92_PIO_PA25 (1 << 25) -#define AT91RM92_PA25_TWD (AT91RM92_PIO_PA25) /* TWI Two-wire Serial Data */ -#define AT91RM92_PA25_IRQ2 (AT91RM92_PIO_PA25) /* Interrupt input 2 */ -#define AT91RM92_PIO_PA26 (1 << 26) -#define AT91RM92_PA26_TWCK (AT91RM92_PIO_PA26) /* TWI Two-wire Serial Clock */ -#define AT91RM92_PA26_IRQ1 (AT91RM92_PIO_PA26) /* Interrupt input 1 */ -#define AT91RM92_PIO_PA27 (1 << 27) -#define AT91RM92_PA27_MCCK (AT91RM92_PIO_PA27) /* Multimedia Card Clock */ -#define AT91RM92_PA27_TCLK3 (AT91RM92_PIO_PA27) /* Timer Counter 3 External Clock Input */ -#define AT91RM92_PIO_PA28 (1 << 28) -#define AT91RM92_PA28_MCCDA (AT91RM92_PIO_PA28) /* Multimedia Card A Command */ -#define AT91RM92_PA28_TCLK4 (AT91RM92_PIO_PA28) /* Timer Counter 4 external Clock Input */ -#define AT91RM92_PIO_PA29 (1 << 29) -#define AT91RM92_PA29_MCDA0 (AT91RM92_PIO_PA29) /* Multimedia Card A Data 0 */ -#define AT91RM92_PA29_TCLK5 (AT91RM92_PIO_PA29) /* Timer Counter 5 external clock input */ -#define AT91RM92_PIO_PA30 (1 << 30) -#define AT91RM92_PA30_DRXD (AT91RM92_PIO_PA30) /* DBGU Debug Receive Data */ -#define AT91RM92_PA30_CTS2 (AT91RM92_PIO_PA30) /* USART 2 Clear To Send */ -#define AT91RM92_PIO_PA31 (1 << 31) -#define AT91RM92_PA31_DTXD (AT91RM92_PIO_PA31) /* DBGU Debug Transmit Data */ -#define AT91RM92_PA31_RTS2 (AT91RM92_PIO_PA31) /* USART 2 Ready To Send */ - -#define AT91RM92_PIO_PB0 (1 << 0) -#define AT91RM92_PB0_TF0 (AT91RM92_PIO_PB0) /* SSC Transmit Frame Sync 0 */ -#define AT91RM92_PB0_RTS3 (AT91RM92_PIO_PB0) /* USART 3 Ready To Send */ -#define AT91RM92_PIO_PB1 (1 << 1) -#define AT91RM92_PB1_TK0 (AT91RM92_PIO_PB1) /* SSC Transmit Clock 0 */ -#define AT91RM92_PB1_CTS3 (AT91RM92_PIO_PB1) /* USART 3 Clear To Send */ -#define AT91RM92_PIO_PB2 (1 << 2) -#define AT91RM92_PB2_TD0 (AT91RM92_PIO_PB2) /* SSC Transmit data */ -#define AT91RM92_PB2_SCK3 (AT91RM92_PIO_PB2) /* USART 3 Serial Clock */ -#define AT91RM92_PIO_PB3 (1 << 3) -#define AT91RM92_PB3_RD0 (AT91RM92_PIO_PB3) /* SSC Receive Data */ -#define AT91RM92_PB3_MCDA1 (AT91RM92_PIO_PB3) /* Multimedia Card A Data 1 */ -#define AT91RM92_PIO_PB4 (1 << 4) -#define AT91RM92_PB4_RK0 (AT91RM92_PIO_PB4) /* SSC Receive Clock */ -#define AT91RM92_PB4_MCDA2 (AT91RM92_PIO_PB4) /* Multimedia Card A Data 2 */ -#define AT91RM92_PIO_PB5 (1 << 5) -#define AT91RM92_PB5_RF0 (AT91RM92_PIO_PB5) /* SSC Receive Frame Sync 0 */ -#define AT91RM92_PB5_MCDA3 (AT91RM92_PIO_PB5) /* Multimedia Card A Data 3 */ -#define AT91RM92_PIO_PB6 (1 << 6) -#define AT91RM92_PB6_TF1 (AT91RM92_PIO_PB6) /* SSC Transmit Frame Sync 1 */ -#define AT91RM92_PB6_TIOA3 (AT91RM92_PIO_PB6) /* Timer Counter 4 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PB7 (1 << 7) -#define AT91RM92_PB7_TK1 (AT91RM92_PIO_PB7) /* SSC Transmit Clock 1 */ -#define AT91RM92_PB7_TIOB3 (AT91RM92_PIO_PB7) /* Timer Counter 3 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PB8 (1 << 8) -#define AT91RM92_PB8_TD1 (AT91RM92_PIO_PB8) /* SSC Transmit Data 1 */ -#define AT91RM92_PB8_TIOA4 (AT91RM92_PIO_PB8) /* Timer Counter 4 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PB9 (1 << 9) -#define AT91RM92_PB9_RD1 (AT91RM92_PIO_PB9) /* SSC Receive Data 1 */ -#define AT91RM92_PB9_TIOB4 (AT91RM92_PIO_PB9) /* Timer Counter 4 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PB10 (1 << 10) -#define AT91RM92_PB10_RK1 (AT91RM92_PIO_PB10) /* SSC Receive Clock 1 */ -#define AT91RM92_PB10_TIOA5 (AT91RM92_PIO_PB10) /* Timer Counter 5 Multipurpose Timer I/O Pin A */ -#define AT91RM92_PIO_PB11 (1 << 11) -#define AT91RM92_PB11_RF1 (AT91RM92_PIO_PB11) /* SSC Receive Frame Sync 1 */ -#define AT91RM92_PB11_TIOB5 (AT91RM92_PIO_PB11) /* Timer Counter 5 Multipurpose Timer I/O Pin B */ -#define AT91RM92_PIO_PB12 (1 << 12) -#define AT91RM92_PB12_TF2 (AT91RM92_PIO_PB12) /* SSC Transmit Frame Sync 2 */ -#define AT91RM92_PB12_ETX2 (AT91RM92_PIO_PB12) /* Ethernet MAC Transmit Data 2 */ -#define AT91RM92_PIO_PB13 (1 << 13) -#define AT91RM92_PB13_TK2 (AT91RM92_PIO_PB13) /* SSC Transmit Clock 2 */ -#define AT91RM92_PB13_ETX3 (AT91RM92_PIO_PB13) /* Ethernet MAC Transmit Data 3 */ -#define AT91RM92_PIO_PB14 (1 << 14) -#define AT91RM92_PB14_TD2 (AT91RM92_PIO_PB14) /* SSC Transmit Data 2 */ -#define AT91RM92_PB14_ETXER (AT91RM92_PIO_PB14) /* Ethernet MAC Transmikt Coding Error */ -#define AT91RM92_PIO_PB15 (1 << 15) -#define AT91RM92_PB15_RD2 (AT91RM92_PIO_PB15) /* SSC Receive Data 2 */ -#define AT91RM92_PB15_ERX2 (AT91RM92_PIO_PB15) /* Ethernet MAC Receive Data 2 */ -#define AT91RM92_PIO_PB16 (1 << 16) -#define AT91RM92_PB16_RK2 (AT91RM92_PIO_PB16) /* SSC Receive Clock 2 */ -#define AT91RM92_PB16_ERX3 (AT91RM92_PIO_PB16) /* Ethernet MAC Receive Data 3 */ -#define AT91RM92_PIO_PB17 (1 << 17) -#define AT91RM92_PB17_RF2 (AT91RM92_PIO_PB17) /* SSC Receive Frame Sync 2 */ -#define AT91RM92_PB17_ERXDV (AT91RM92_PIO_PB17) /* Ethernet MAC Receive Data Valid */ -#define AT91RM92_PIO_PB18 (1 << 18) -#define AT91RM92_PB18_RI1 (AT91RM92_PIO_PB18) /* USART 1 Ring Indicator */ -#define AT91RM92_PB18_ECOL (AT91RM92_PIO_PB18) /* Ethernet MAC Collision Detected */ -#define AT91RM92_PIO_PB19 (1 << 19) -#define AT91RM92_PB19_DTR1 (AT91RM92_PIO_PB19) /* USART 1 Data Terminal ready */ -#define AT91RM92_PB19_ERXCK (AT91RM92_PIO_PB19) /* Ethernet MAC Receive Clock */ -#define AT91RM92_PIO_PB20 (1 << 20) -#define AT91RM92_PB20_TXD1 (AT91RM92_PIO_PB20) /* USART 1 Transmit Data */ -#define AT91RM92_PIO_PB21 (1 << 21) -#define AT91RM92_PB21_RXD1 (AT91RM92_PIO_PB21) /* USART 1 Receive Data */ -#define AT91RM92_PIO_PB22 (1 << 22) -#define AT91RM92_PB22_SCK1 (AT91RM92_PIO_PB22) /* USART 1 Serial Clock */ -#define AT91RM92_PIO_PB23 (1 << 23) -#define AT91RM92_PB23_DCD1 (AT91RM92_PIO_PB23) /* USART 1 Data Carrier Detect */ -#define AT91RM92_PIO_PB24 (1 << 24) -#define AT91RM92_PB24_CTS1 (AT91RM92_PIO_PB24) /* USART 1 Clear To Send */ -#define AT91RM92_PIO_PB25 (1 << 25) -#define AT91RM92_PB25_DSR1 (AT91RM92_PIO_PB25) /* USART 1 Data Set ready */ -#define AT91RM92_PB25_EF100 (AT91RM92_PIO_PB25) /* Ethernet MAC Force 100 Mbits/sec */ -#define AT91RM92_PIO_PB26 (1 << 26) -#define AT91RM92_PB26_RTS1 (AT91RM92_PIO_PB26) /* USART 1 Ready To Send */ -#define AT91RM92_PIO_PB27 (1 << 27) -#define AT91RM92_PB27_PCK0 (AT91RM92_PIO_PB27) /* PMC Programmable Clock Output 0 */ -#define AT91RM92_PIO_PB28 (1 << 28) -#define AT91RM92_PB28_FIQ (AT91RM92_PIO_PB28) /* AIC Fast Interrupt Input */ -#define AT91RM92_PIO_PB29 (1 << 29) -#define AT91RM92_PB29_IRQ0 (AT91RM92_PIO_PB29) /* Interrupt input 0 */ - -#define AT91RM92_PIO_PC0 (1 << 0) -#define AT91RM92_PC0_BFCK (AT91RM92_PIO_PC0) /* Burst Flash Clock */ -#define AT91RM92_PIO_PC1 (1 << 1) -#define AT91RM92_PC1_BFRDY_SMOE (AT91RM92_PIO_PC1) /* Burst Flash Ready */ -#define AT91RM92_PIO_PC2 (1 << 2) -#define AT91RM92_PC2_BFAVD (AT91RM92_PIO_PC2) /* Burst Flash Address Valid */ -#define AT91RM92_PIO_PC3 (1 << 3) -#define AT91RM92_PC3_BFBAA_SMWE (AT91RM92_PIO_PC3) /* Burst Flash Address Advance / SmartMedia Write Enable */ -#define AT91RM92_PIO_PC4 (1 << 4) -#define AT91RM92_PC4_BFOE (AT91RM92_PIO_PC4) /* Burst Flash Output Enable */ -#define AT91RM92_PIO_PC5 (1 << 5) -#define AT91RM92_PC5_BFWE (AT91RM92_PIO_PC5) /* Burst Flash Write Enable */ -#define AT91RM92_PIO_PC6 (1 << 6) -#define AT91RM92_PC6_NWAIT (AT91RM92_PIO_PC6) /* NWAIT */ -#define AT91RM92_PIO_PC7 (1 << 7) -#define AT91RM92_PC7_A23 (AT91RM92_PIO_PC7) /* Address Bus[23] */ -#define AT91RM92_PIO_PC8 (1 << 8) -#define AT91RM92_PC8_A24 (AT91RM92_PIO_PC8) /* Address Bus[24] */ -#define AT91RM92_PIO_PC9 (1 << 9) -#define AT91RM92_PC9_A25_CFRNW (AT91RM92_PIO_PC9) /* Address Bus[25] / Compact Flash Read Not Write */ -#define AT91RM92_PIO_PC10 (1 << 10) -#define AT91RM92_PC10_NCS4_CFCS (AT91RM92_PIO_PC10) /* Compact Flash Chip Select */ -#define AT91RM92_PIO_PC11 (1 << 11) -#define AT91RM92_PC11_NCS5_CFCE1 (AT91RM92_PIO_PC11) /* Chip Select 5 / Compact Flash Chip Enable 1 */ -#define AT91RM92_PIO_PC12 (1 << 12) -#define AT91RM92_PC12_NCS6_CFCE2(AT91RM92_PIO_PC12) /* Chip Select 6 / Compact Flash Chip Enable 2 */ -#define AT91RM92_PIO_PC13 (1 << 13) -#define AT91RM92_PC13_NCS7 (AT91RM92_PIO_PC13) /* Chip Select 7 */ -#define AT91RM92_PIO_PC14 (1 << 14) -#define AT91RM92_PIO_PC15 (1 << 15) -#define AT91RM92_PIO_PC16 (1 << 16) -#define AT91RM92_PC16_D16 (AT91RM92_PIO_PC16) /* Data Bus [16] */ -#define AT91RM92_PIO_PC17 (1 << 17) -#define AT91RM92_PC17_D17 (AT91RM92_PIO_PC17) /* Data Bus [17] */ -#define AT91RM92_PIO_PC18 (1 << 18) -#define AT91RM92_PC18_D18 (AT91RM92_PIO_PC18) /* Data Bus [18] */ -#define AT91RM92_PIO_PC19 (1 << 19) -#define AT91RM92_PC19_D19 (AT91RM92_PIO_PC19) /* Data Bus [19] */ -#define AT91RM92_PIO_PC20 (1 << 20) -#define AT91RM92_PC20_D20 (AT91RM92_PIO_PC20) /* Data Bus [20] */ -#define AT91RM92_PIO_PC21 (1 << 21) -#define AT91RM92_PC21_D21 (AT91RM92_PIO_PC21) /* Data Bus [21] */ -#define AT91RM92_PIO_PC22 (1 << 22) -#define AT91RM92_PC22_D22 (AT91RM92_PIO_PC22) /* Data Bus [22] */ -#define AT91RM92_PIO_PC23 (1 << 23) -#define AT91RM92_PC23_D23 (AT91RM92_PIO_PC23) /* Data Bus [23] */ -#define AT91RM92_PIO_PC24 (1 << 24) -#define AT91RM92_PC24_D24 (AT91RM92_PIO_PC24) /* Data Bus [24] */ -#define AT91RM92_PIO_PC25 (1 << 25) -#define AT91RM92_PC25_D25 (AT91RM92_PIO_PC25) /* Data Bus [25] */ -#define AT91RM92_PIO_PC26 (1 << 26) -#define AT91RM92_PC26_D26 (AT91RM92_PIO_PC26) /* Data Bus [26] */ -#define AT91RM92_PIO_PC27 (1 << 27) -#define AT91RM92_PC27_D27 (AT91RM92_PIO_PC27) /* Data Bus [27] */ -#define AT91RM92_PIO_PC28 (1 << 28) -#define AT91RM92_PC28_D28 (AT91RM92_PIO_PC28) /* Data Bus [28] */ -#define AT91RM92_PIO_PC29 (1 << 29) -#define AT91RM92_PC29_D29 (AT91RM92_PIO_PC29) /* Data Bus [29] */ -#define AT91RM92_PIO_PC30 (1 << 30) -#define AT91RM92_PC30_D30 (AT91RM92_PIO_PC30) /* Data Bus [30] */ -#define AT91RM92_PIO_PC31 (1 << 31) -#define AT91RM92_PC31_D31 (AT91RM92_PIO_PC31) /* Data Bus [31] */ - -#define AT91RM92_PIO_PD0 (1 << 0) -#define AT91RM92_PD0_ETX0 (AT91RM92_PIO_PD0) /* Ethernet MAC Transmit Data 0 */ -#define AT91RM92_PIO_PD1 (1 << 1) -#define AT91RM92_PD1_ETX1 (AT91RM92_PIO_PD1) /* Ethernet MAC Transmit Data 1 */ -#define AT91RM92_PIO_PD2 (1 << 2) -#define AT91RM92_PD2_ETX2 (AT91RM92_PIO_PD2) /* Ethernet MAC Transmit Data 2 */ -#define AT91RM92_PIO_PD3 (1 << 3) -#define AT91RM92_PD3_ETX3 (AT91RM92_PIO_PD3) /* Ethernet MAC Transmit Data 3 */ -#define AT91RM92_PIO_PD4 (1 << 4) -#define AT91RM92_PD4_ETXEN (AT91RM92_PIO_PD4) /* Ethernet MAC Transmit Enable */ -#define AT91RM92_PIO_PD5 (1 << 5) -#define AT91RM92_PD5_ETXER (AT91RM92_PIO_PD5) /* Ethernet MAC Transmit Coding Error */ -#define AT91RM92_PIO_PD6 (1 << 6) -#define AT91RM92_PD6_DTXD (AT91RM92_PIO_PD6) /* DBGU Debug Transmit Data */ -#define AT91RM92_PIO_PD7 (1 << 7) -#define AT91RM92_PD7_PCK0 (AT91RM92_PIO_PD7) /* PMC Programmable Clock Output 0 */ -#define AT91RM92_PD7_TSYNC (AT91RM92_PIO_PD7) /* ETM Synchronization signal */ -#define AT91RM92_PIO_PD8 (1 << 8) -#define AT91RM92_PD8_PCK1 (AT91RM92_PIO_PD8) /* PMC Programmable Clock Output 1 */ -#define AT91RM92_PD8_TCLK (AT91RM92_PIO_PD8) /* ETM Trace Clock signal */ -#define AT91RM92_PIO_PD9 (1 << 9) -#define AT91RM92_PD9_PCK2 (AT91RM92_PIO_PD9) /* PMC Programmable Clock 2 */ -#define AT91RM92_PD9_TPS0 (AT91RM92_PIO_PD9) /* ETM ARM9 pipeline status 0 */ -#define AT91RM92_PIO_PD10 (1 << 10) -#define AT91RM92_PD10_PCK3 (AT91RM92_PIO_PD10) /* PMC Programmable Clock Output 3 */ -#define AT91RM92_PD10_TPS1 (AT91RM92_PIO_PD10) /* ETM ARM9 pipeline status 1 */ -#define AT91RM92_PIO_PD11 (1 << 11) -#define AT91RM92_PD11_TPS2 (AT91RM92_PIO_PD11) /* ETM ARM9 pipeline status 2 */ -#define AT91RM92_PIO_PD12 (1 << 12) -#define AT91RM92_PD12_TPK0 (AT91RM92_PIO_PD12) /* ETM Trace Packet 0 */ -#define AT91RM92_PIO_PD13 (1 << 13) -#define AT91RM92_PD13_TPK1 (AT91RM92_PIO_PD13) /* ETM Trace Packet 1 */ -#define AT91RM92_PIO_PD14 (1 << 14) -#define AT91RM92_PD14_TPK2 (AT91RM92_PIO_PD14) /* ETM Trace Packet 2 */ -#define AT91RM92_PIO_PD15 (1 << 15) -#define AT91RM92_PD15_TD0 (AT91RM92_PIO_PD15) /* SSC Transmit data */ -#define AT91RM92_PD15_TPK3 (AT91RM92_PIO_PD15) /* ETM Trace Packet 3 */ -#define AT91RM92_PIO_PD16 (1 << 16) -#define AT91RM92_PD16_TD1 (AT91RM92_PIO_PD16) /* SSC Transmit Data 1 */ -#define AT91RM92_PD16_TPK4 (AT91RM92_PIO_PD16) /* ETM Trace Packet 4 */ -#define AT91RM92_PIO_PD17 (1 << 17) -#define AT91RM92_PD17_TD2 (AT91RM92_PIO_PD17) /* SSC Transmit Data 2 */ -#define AT91RM92_PD17_TPK5 (AT91RM92_PIO_PD17) /* ETM Trace Packet 5 */ -#define AT91RM92_PIO_PD18 (1 << 18) -#define AT91RM92_PD18_NPCS1 (AT91RM92_PIO_PD18) /* SPI Peripheral Chip Select 1 */ -#define AT91RM92_PD18_TPK6 (AT91RM92_PIO_PD18) /* ETM Trace Packet 6 */ -#define AT91RM92_PIO_PD19 (1 << 19) -#define AT91RM92_PD19_NPCS2 (AT91RM92_PIO_PD19) /* SPI Peripheral Chip Select 2 */ -#define AT91RM92_PD19_TPK7 (AT91RM92_PIO_PD19) /* ETM Trace Packet 7 */ -#define AT91RM92_PIO_PD20 (1 << 20) -#define AT91RM92_PD20_NPCS3 (AT91RM92_PIO_PD20) /* SPI Peripheral Chip Select 3 */ -#define AT91RM92_PD20_TPK8 (AT91RM92_PIO_PD20) /* ETM Trace Packet 8 */ -#define AT91RM92_PIO_PD21 (1 << 21) -#define AT91RM92_PD21_RTS0 (AT91RM92_PIO_PD21) /* Usart 0 Ready To Send */ -#define AT91RM92_PD21_TPK9 (AT91RM92_PIO_PD21) /* ETM Trace Packet 9 */ -#define AT91RM92_PIO_PD22 (1 << 22) -#define AT91RM92_PD22_RTS1 (AT91RM92_PIO_PD22) /* Usart 0 Ready To Send */ -#define AT91RM92_PD22_TPK10 (AT91RM92_PIO_PD22) /* ETM Trace Packet 10 */ -#define AT91RM92_PIO_PD23 (1 << 23) -#define AT91RM92_PD23_RTS2 (AT91RM92_PIO_PD23) /* USART 2 Ready To Send */ -#define AT91RM92_PD23_TPK11 (AT91RM92_PIO_PD23) /* ETM Trace Packet 11 */ -#define AT91RM92_PIO_PD24 (1 << 24) -#define AT91RM92_PD24_RTS3 (AT91RM92_PIO_PD24) /* USART 3 Ready To Send */ -#define AT91RM92_PD24_TPK12 (AT91RM92_PIO_PD24) /* ETM Trace Packet 12 */ -#define AT91RM92_PIO_PD25 (1 << 25) -#define AT91RM92_PD25_DTR1 (AT91RM92_PIO_PD25) /* USART 1 Data Terminal ready */ -#define AT91RM92_PD25_TPK13 (AT91RM92_PIO_PD25) /* ETM Trace Packet 13 */ -#define AT91RM92_PIO_PD26 (1 << 26) -#define AT91RM92_PD26_TPK14 (AT91RM92_PIO_PD26) /* ETM Trace Packet 14 */ -#define AT91RM92_PIO_PD27 (1 << 27) -#define AT91RM92_PD27_TPK15 (AT91RM92_PIO_PD27) /* ETM Trace Packet 15 */ - #define AT91C_MASTER_CLOCK 60000000 #endif /* AT91RM92REG_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Feb 19 08:38: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 63D2B16A423; Sun, 19 Feb 2006 08:38:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 270C416A420 for ; Sun, 19 Feb 2006 08:38:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF74543D45 for ; Sun, 19 Feb 2006 08:38:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1J8csH7011344 for ; Sun, 19 Feb 2006 08:38:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J8cs9w011341 for perforce@freebsd.org; Sun, 19 Feb 2006 08:38:54 GMT (envelope-from imp@freebsd.org) Date: Sun, 19 Feb 2006 08:38:54 GMT Message-Id: <200602190838.k1J8cs9w011341@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 92034 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, 19 Feb 2006 08:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92034 Change 92034 by imp@imp_plunger on 2006/02/19 08:38:00 Go ahead and allocate things for the pmc. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#7 (text+ko) ==== @@ -42,12 +42,13 @@ #include #include #include -#include + #include static struct at91_pmc_softc { bus_space_tag_t sc_st; bus_space_handle_t sc_sh; + struct resource *mem_res; /* Memory resource */ device_t dev; int main_clock_hz; uint32_t pllb_init; @@ -154,10 +155,17 @@ &ohci_clk }; -#define RD4(off) \ - bus_space_read_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off)) -#define WR4(off, val) \ - bus_space_write_4(pmc_softc->sc_st, pmc_softc->sc_sh, (off), (val)) +static inline uint32_t +RD4(struct at91_pmc_softc *sc, bus_size_t off) +{ + return bus_read_4(sc->mem_res, off); +} + +static inline void +WR4(struct at91_pmc_softc *sc, bus_size_t off, uint32_t val) +{ + bus_write_4(sc->mem_res, off, val); +} static void at91_pmc_set_pllb_mode(struct at91_pmc_clock *clk, int on) @@ -249,33 +257,65 @@ */ sc->pllb_init = at91_pmc_pll_calc(main_clock, 48000000 * 2) |0x10000000; pllb.hz = at91_pmc_pll_rate(main_clock, sc->pllb_init, 1); - WR4(PMC_PCDR, (1 << AT91RM92_IRQ_UHP) | (1 << AT91RM92_IRQ_UDP)); - WR4(PMC_SCDR, PMC_SCER_UHP | PMC_SCER_UDP); - WR4(CKGR_PLLBR, 0); - WR4(PMC_SCER, PMC_SCER_MCKUDP); + WR4(sc, PMC_PCDR, (1 << AT91RM92_IRQ_UHP) | (1 << AT91RM92_IRQ_UDP)); + WR4(sc, PMC_SCDR, PMC_SCER_UHP | PMC_SCER_UDP); + WR4(sc, CKGR_PLLBR, 0); + WR4(sc, PMC_SCER, PMC_SCER_MCKUDP); /* * MCK and PCU derive from one of the primary clocks. Initialize * this relationship. */ - mckr = RD4(PMC_MCKR); + mckr = RD4(sc, PMC_MCKR); mck.parent = clock_list[mckr & 0x3]; mck.parent->refcnt++; freq = mck.parent->hz; freq /= 1 << ((mckr >> 2) & 3); mck.hz = freq / (1 + ((mckr >> 8) & 3)); - printf("Main clock is %x\n", RD4(PMC_MCKR)); + printf("Main clock is %x\n", RD4(sc, PMC_MCKR)); device_printf(sc->dev, "main clock = %d Hz PLLA = %d Hz CPU %d Hz main %d Hz\n", sc->main_clock_hz, - at91_pmc_pll_rate(main_clock, RD4(CKGR_PLLAR), 0), + at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0), freq, mck.hz); - WR4(PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | + WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); } +static void +at91_pmc_deactivate(device_t dev) +{ + struct at91_pmc_softc *sc; + + sc = device_get_softc(dev); + bus_generic_detach(sc->dev); + if (sc->mem_res) + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = 0; + return; +} + static int +at91_pmc_activate(device_t dev) +{ + struct at91_pmc_softc *sc; + int rid; + + sc = device_get_softc(dev); + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) + goto errout; + return (0); +errout: + at91_pmc_deactivate(dev); + return (ENOMEM); +} + +static int at91_pmc_probe(device_t dev) { @@ -286,14 +326,12 @@ static int at91_pmc_attach(device_t dev) { - struct at91_softc *sc = device_get_softc(device_get_parent(dev)); + int err; pmc_softc = device_get_softc(dev); - pmc_softc->sc_st = sc->sc_st; pmc_softc->dev = dev; - if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_PMC_BASE, - AT91RM92_PMC_SIZE, &pmc_softc->sc_sh) != 0) - panic("couldn't subregion timer registers"); + if ((err = at91_pmc_activate(dev)) != 0) + return err; at91_pmc_init_clock(pmc_softc, 10000000); return (0); From owner-p4-projects@FreeBSD.ORG Sun Feb 19 15:54:51 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 074E816A423; Sun, 19 Feb 2006 15:54:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B924D16A420 for ; Sun, 19 Feb 2006 15:54:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71D1D43D46 for ; Sun, 19 Feb 2006 15:54:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1JFsoeb045069 for ; Sun, 19 Feb 2006 15:54:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1JFsoXR045066 for perforce@freebsd.org; Sun, 19 Feb 2006 15:54:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Feb 2006 15:54:50 GMT Message-Id: <200602191554.k1JFsoXR045066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92044 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, 19 Feb 2006 15:54:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92044 Change 92044 by rwatson@rwatson_fledge on 2006/02/19 15:54:16 Add UFS2 reference to EA section. Add GEOM section. Add OpenPAM section. Add side bar to front page. Use small Trusty on front page. Affected files ... .. //depot/projects/trustedbsd/www/components.page#4 edit .. //depot/projects/trustedbsd/www/home.page#3 edit .. //depot/projects/trustedbsd/www/page.xsl#2 edit .. //depot/projects/trustedbsd/www/sidebar.xml#4 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#4 (text+ko) ==== @@ -1,5 +1,5 @@ - - Trusty - - - Trusty - - + Trusty
@@ -100,8 +91,8 @@

    + Copyright 2000-2006 Robert Watson. All rights reserved.
    Copyright 2005 SPARTA, Inc. All rights reserved.
    - Copyright 2000-2005 Robert Watson. All rights reserved.
    Copyright 2002, Leigh Denault. All rights reserved.
    Copyright 2002, 2003 Networks Associates, Inc. All rights reserved.
    ==== //depot/projects/trustedbsd/www/sidebar.xml#4 (text+ko) ==== @@ -1,18 +1,36 @@ +
    +

    TrustedBSD News

    + +
    +

    Components

    From owner-p4-projects@FreeBSD.ORG Sun Feb 19 16:03: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 366DC16A423; Sun, 19 Feb 2006 16:03:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED77516A420 for ; Sun, 19 Feb 2006 16:03:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B61ED43D48 for ; Sun, 19 Feb 2006 16:03:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1JG30YB045438 for ; Sun, 19 Feb 2006 16:03:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1JG30Kj045433 for perforce@freebsd.org; Sun, 19 Feb 2006 16:03:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Feb 2006 16:03:00 GMT Message-Id: <200602191603.k1JG30Kj045433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92045 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, 19 Feb 2006 16:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92045 Change 92045 by rwatson@rwatson_fledge on 2006/02/19 16:02:28 Add news items about audit integration and mailing list server change. Affected files ... .. //depot/projects/trustedbsd/www/news.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#4 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#3 $ + $P4: //depot/projects/trustedbsd/www/news.page#4 $ @@ -46,13 +46,25 @@

    News announcements and press clippings related to the TrustedBSD Project.

    - +

    Robert Watson and Wayne Salamon announce the beginning of the + merging of CAPP Audit support to the + base FreeBSD CVS tree, which will take several weeks to complete. + They also announce integration of an OpenBSM pre-release into CVS.

    -
    April 29, 2005 TrustedBSD at BSDCan 2005

    The TrustedBSD Project will be presenting on the TrustedBSD / From owner-p4-projects@FreeBSD.ORG Sun Feb 19 19:29: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 1452F16A423; Sun, 19 Feb 2006 19:29:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A205016A420 for ; Sun, 19 Feb 2006 19:29:26 +0000 (GMT) (envelope-from scottk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49E7C43D45 for ; Sun, 19 Feb 2006 19:29:26 +0000 (GMT) (envelope-from scottk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1JJTQJK063257 for ; Sun, 19 Feb 2006 19:29:26 GMT (envelope-from scottk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1JJTN06063193 for perforce@freebsd.org; Sun, 19 Feb 2006 19:29:23 GMT (envelope-from scottk@freebsd.org) Date: Sun, 19 Feb 2006 19:29:23 GMT Message-Id: <200602191929.k1JJTN06063193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottk@freebsd.org using -f From: Scott Kamp To: Perforce Change Reviews Cc: Subject: PERFORCE change 92056 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, 19 Feb 2006 19:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92056 Change 92056 by scottk@pavilion on 2006/02/19 19:22:23 Migrate from sebsd to sebsd2 to start new branch to bring current Integrate vendor branch //depot/vendor/freebsd/src/... to /depot/projects/trustedbsd/sebsd2 to bring SeBSD up to date and current with FreeBSD CURRENT Submitted by: scottk@freebsd.org Affected files ... .. //depot/projects/trustedbsd/sebsd2/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/sebsd2/LOCKS#1 branch .. //depot/projects/trustedbsd/sebsd2/MAINTAINERS#1 branch .. //depot/projects/trustedbsd/sebsd2/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/Makefile.inc1#1 branch .. //depot/projects/trustedbsd/sebsd2/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/sebsd2/README#1 branch .. //depot/projects/trustedbsd/sebsd2/UPDATING#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/cat.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/cat.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/chio.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/chio.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/pathnames.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/chmod.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/chmod.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/cp.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/cp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/utils.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/config.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/config_p.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/host.defs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/date.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/date.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/netdate.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/vary.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/vary.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/args.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/conv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/conv_tab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/position.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/df.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/df.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/domainname.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/domainname.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/echo.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/echo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/POSIX#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/buf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/cbc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/ed.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/ed.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/glbl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/io.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/re.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/sub.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/=.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/TODO#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/f1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/f2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/h.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k4.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s10.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s4.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s5.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s6.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s7.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s8.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s9.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/x.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/z.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/undo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/expr.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/expr.y#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/getfacl.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/getfacl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/hostname.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/hostname.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/kill.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/kill.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/ln.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/ln.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/symlink.7#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/cmp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/mkdir.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/mkdir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/mv.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/mv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ar_io.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ar_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/buf_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cache.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cache.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/file_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ftree.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ftree.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/gen_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/getoldopt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/options.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/options.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pat_rep.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pat_rep.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/sel_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/sel_subs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tables.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tables.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tty_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/fmt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/keyword.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/nlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/pwd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/pwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/rcp.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/rcp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/realpath.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/realpath.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/rm.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/rm.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmail/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/rmdir.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/rmdir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/file.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/mask.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/merge.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/remove.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/TOUR#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/alias.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/alias.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith.y#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith_lex.l#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/echo.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/echo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/builtins.def#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/cd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/cd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/error.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/error.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/eval.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/eval.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/exec.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/exec.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/expand.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/expand.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/cmv#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/dirs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/kill#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/login#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/newgrp#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/popd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/pushd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/suspend#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/histedit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/init.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/input.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/input.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/jobs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/jobs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mail.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mail.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/main.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/memalloc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/memalloc.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/miscbltin.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mkbuiltins#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mkinit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mknodes.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mksyntax.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mktokens#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/myhistedit.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mystring.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mystring.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/nodes.c.pat#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/nodetypes#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/options.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/options.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/output.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/output.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/parser.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/parser.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/redir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/redir.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/sh.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/shell.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/show.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/show.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/trap.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/trap.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/var.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/var.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/sleep.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/sleep.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/cchar.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/gfmt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/key.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/modes.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/sync.8#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/sync.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.csh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/test.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/test.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/BUGS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/COPYING#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/NEWS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README.ldap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README.y2k#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/autil.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/clock.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/map.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/opts.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/restart.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/sched.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/version.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/tasks#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/FAQ#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/NEWS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/array.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/atan.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/div.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/exp.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/fact.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/jn.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/ln.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/mul.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/raise.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/signum#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sine.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/timetest#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/acconfig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/aclocal.m4#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/bc.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/const.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/execute.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/global.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/global.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/load.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/proto.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/scan.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/storage.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/config.h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/configure#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/configure.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/array.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/eval.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/stack.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/string.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/bc.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/dc.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/h/number.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/install-sh#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/number.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/missing#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/stamp-h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/CHANGES#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FAQ#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/acconfig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.guess#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.sub#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/configure.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3364.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 20 05:29:04 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 51A7416A425; Mon, 20 Feb 2006 05:29:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 063CF16A423 for ; Mon, 20 Feb 2006 05:29:03 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1592643D45 for ; Mon, 20 Feb 2006 05:29:02 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1K5T2tP074733 for ; Mon, 20 Feb 2006 05:29:02 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1K5SB0k074659 for perforce@freebsd.org; Mon, 20 Feb 2006 05:28:11 GMT (envelope-from scottl@freebsd.org) Date: Mon, 20 Feb 2006 05:28:11 GMT Message-Id: <200602200528.k1K5SB0k074659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92073 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, 20 Feb 2006 05:29:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92073 Change 92073 by scottl@scottl-junior on 2006/02/20 05:27:31 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/busdma_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/interrupt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/promcons.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/sgmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC#6 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/_types.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/atomic.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpuconf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/param.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pmap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/signal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/smp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/vmparam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_proto.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_syscall.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysent.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysvec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/syscalls.master#5 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/mcbus/mcpcia.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/apecs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/cia.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/lca.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/pcibus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/t2.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/pci/tsunami_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/dwlpx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_limits.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_types.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/frame.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/signal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/support.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_limits.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_types.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/frame.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/in_cksum.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/signal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/help.common#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/bootinfo.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_memory.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/io.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/comconsole.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/metadata.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/pe_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_siginfo.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_signal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_signal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.alpha#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.i386#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.alpha#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.arm#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/systags.sh#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdisasm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acglobal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acinterp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acmacros.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acutils.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbdisply.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbexec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmopcode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsopcode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpeblk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresnte.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsaccess.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/uteval.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utglobal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/amd64/nvenetlib.README#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/i386/nvenetlib.README#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_access.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_watch.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_tables.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdDebug.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdMemory.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdStream.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSynch.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdTable.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_button.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_isab.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_package.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_resource.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_timer.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advlib.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrio.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/dptsig.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/i2odep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_card.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_tuner.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_drm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_drv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_state.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_warp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_cce.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_drm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_drv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_state.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_mem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_drm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_ds.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/README#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/midway.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9xvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/gfb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/tga.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hmereg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/amd64-elf.raid.o.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/global.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ie/if_ie.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_commands.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_ioctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_inline.h#5 delete .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwireg.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 20 18:59: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 E405916A424; Mon, 20 Feb 2006 18:59:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F91216A420; Mon, 20 Feb 2006 18:59:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D735143D46; Mon, 20 Feb 2006 18:59:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1KIwoVU022835; Mon, 20 Feb 2006 13:58:59 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Scott Kamp Date: Mon, 20 Feb 2006 13:59:34 -0500 User-Agent: KMail/1.9.1 References: <200602191929.k1JJTN06063193@repoman.freebsd.org> In-Reply-To: <200602191929.k1JJTN06063193@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602201359.35492.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1293/Sun Feb 19 11:40:25 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews , rwatson@freebsd.org Subject: Re: PERFORCE change 92056 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, 20 Feb 2006 18:59:02 -0000 On Sunday 19 February 2006 14:29, Scott Kamp wrote: > http://perforce.freebsd.org/chv.cgi?CH=92056 > > Change 92056 by scottk@pavilion on 2006/02/19 19:22:23 > > Migrate from sebsd to sebsd2 to start new branch to bring current > Integrate vendor branch //depot/vendor/freebsd/src/... to > /depot/projects/trustedbsd/sebsd2 to bring SeBSD up to date and current > with FreeBSD CURRENT Submitted by: scottk@freebsd.org FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of their branch name: trustedbsd_acl trustedbsd_acl_nfsv4 trustedbsd_audit trustedbsd_audit2 trustedbsd_audit3 trustedbsd_audit3_old trustedbsd_audit3_openbsm_sys trustedbsd_cap trustedbsd_doc trustedbsd_dsep trustedbsd_mac trustedbsd_objlabel trustedbsd_openbsm_audit3 trustedbsd_sebsd trustedbsd_sedarwin If you were following that pattern you would use 'trustedbsd_sebsd2' rather than just 'sebsd2'. Also, all the other TrustedBSD branches are branched from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... For example, the audit3 branch's view is: View: //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... Wherease the sebsd2 branch's view is: View: //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... Is the inconsistency intentional? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Feb 20 20:46: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 67B5C16A423; Mon, 20 Feb 2006 20:46:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1D5416A420; Mon, 20 Feb 2006 20:46:22 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from mail.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECC9D43D45; Mon, 20 Feb 2006 20:46:21 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (unknown [127.0.0.1]) by mail.optimhosts.com (Postfix) with ESMTP id 3CEED8C86B3; Tue, 21 Feb 2006 04:48:03 +0800 (PHT) Received: from mail.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79576-07; Tue, 21 Feb 2006 04:47:35 +0800 (PHT) Received: from [192.168.2.185] (adsl-217-74-108.asm.bellsouth.net [68.217.74.108]) by mail.optimhosts.com (Postfix) with ESMTP id 4304B8C8541; Tue, 21 Feb 2006 04:47:31 +0800 (PHT) From: D1ng0 To: John Baldwin In-Reply-To: <200602201359.35492.jhb@freebsd.org> References: <200602191929.k1JJTN06063193@repoman.freebsd.org> <200602201359.35492.jhb@freebsd.org> Content-Type: text/plain Date: Tue, 21 Feb 2006 04:45:38 +0800 Message-Id: <1140468339.799.9.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: rwatson@freebsd.org, Scott Kamp , Perforce Change Reviews Subject: Re: PERFORCE change 92056 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, 20 Feb 2006 20:46:27 -0000 > FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of their > branch name: > > trustedbsd_acl > trustedbsd_acl_nfsv4 > trustedbsd_audit > trustedbsd_audit2 > trustedbsd_audit3 > trustedbsd_audit3_old > trustedbsd_audit3_openbsm_sys > trustedbsd_cap > trustedbsd_doc > trustedbsd_dsep > trustedbsd_mac > trustedbsd_objlabel > trustedbsd_openbsm_audit3 > trustedbsd_sebsd > trustedbsd_sedarwin > > If you were following that pattern you would use 'trustedbsd_sebsd2' rather > than just 'sebsd2'. Also, all the other TrustedBSD branches are branched > from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... > For example, the audit3 branch's view is: > > View: > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > Wherease the sebsd2 branch's view is: > > View: > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > Is the inconsistency intentional? > the trustedbsd_ branch name was an over sight, the branching from //depot/vendor/freebsd/src/... instead of //depot/projects/trustedbsd/base/... was due to a conversation pertaining to pulling in audit to sebsd2 while working to bring it current, referring to the specific email would be Subject: Re: Migrating SeBSD to CUREENT - Are we alive ??? Date: Thu, 16 Feb 2006 13:45:11 +0000 (GMT) (21:45 PHT) where Robert stated it would be best to branch from vendor/freebsd or even trustedbsd/mac to include the audit code, though mac is in an untested state. So i went with vendor/src/... now as for the branch name, how can we resolv that. From owner-p4-projects@FreeBSD.ORG Mon Feb 20 20: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 B638A16A425; Mon, 20 Feb 2006 20:57:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2BD116A420; Mon, 20 Feb 2006 20:57:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C8043D48; Mon, 20 Feb 2006 20:57:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1KKv4vR023823; Mon, 20 Feb 2006 15:57:04 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: D1ng0 Date: Mon, 20 Feb 2006 15:58:05 -0500 User-Agent: KMail/1.9.1 References: <200602191929.k1JJTN06063193@repoman.freebsd.org> <200602201359.35492.jhb@freebsd.org> <1140468339.799.9.camel@pavilion.optimlabs.com> In-Reply-To: <1140468339.799.9.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602201558.07967.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1293/Sun Feb 19 11:40:25 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: rwatson@freebsd.org, Scott Kamp , Perforce Change Reviews Subject: Re: PERFORCE change 92056 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, 20 Feb 2006 20:57:16 -0000 On Monday 20 February 2006 15:45, D1ng0 wrote: > > FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of > > their branch name: > > > > trustedbsd_acl > > trustedbsd_acl_nfsv4 > > trustedbsd_audit > > trustedbsd_audit2 > > trustedbsd_audit3 > > trustedbsd_audit3_old > > trustedbsd_audit3_openbsm_sys > > trustedbsd_cap > > trustedbsd_doc > > trustedbsd_dsep > > trustedbsd_mac > > trustedbsd_objlabel > > trustedbsd_openbsm_audit3 > > trustedbsd_sebsd > > trustedbsd_sedarwin > > > > If you were following that pattern you would use 'trustedbsd_sebsd2' > > rather than just 'sebsd2'. Also, all the other TrustedBSD branches are > > branched from the 'trustedbsd' base branch in > > //depot/projects/trustedbsd/base/... For example, the audit3 branch's > > view is: > > > > View: > > //depot/projects/trustedbsd/base/... > > //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... > > //depot/projects/trustedbsd/sebsd2/... > > > > Is the inconsistency intentional? > > the trustedbsd_ branch name was an over sight, the branching > from //depot/vendor/freebsd/src/... instead > of //depot/projects/trustedbsd/base/... was due to a conversation > pertaining to pulling in audit to sebsd2 while working to bring it > current, referring to the specific email would be > > Subject: > Re: Migrating SeBSD to CUREENT - Are > we alive ??? > Date: > Thu, 16 Feb 2006 13:45:11 +0000 > (GMT) (21:45 PHT) > > where Robert stated it would be best to branch from vendor/freebsd or > even trustedbsd/mac to include the audit code, though mac is in an > untested state. So i went with vendor/src/... now as for the branch > name, how can we resolv that. I think Robert would probably prefer //depot/projects/trustedbsd/base/... It's basically a snapshot of //depot/vendor/freebsd/... I'll leave that to him to clarify. As far as the branch, you can just create a new trustedbsd_sebsd2 branch with the correct view and delete the old sebsd2 branch. Branches are just names for views in p4. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Feb 20 21:17: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 6A30316A424; Mon, 20 Feb 2006 21:17:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4143016A422 for ; Mon, 20 Feb 2006 21:17:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB67443D62 for ; Mon, 20 Feb 2006 21:17:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1KLHe1v058369 for ; Mon, 20 Feb 2006 21:17:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1KLHeZs058363 for perforce@freebsd.org; Mon, 20 Feb 2006 21:17:40 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Feb 2006 21:17:40 GMT Message-Id: <200602202117.k1KLHeZs058363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92094 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, 20 Feb 2006 21:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=92094 Change 92094 by jhb@jhb_slimer on 2006/02/20 21:16:54 ptrace_clear_single_step() needs callers to hold the proc lock and PHOLD/PRELE. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#63 edit .. //depot/projects/smpng/sys/alpha/include/ptrace.h#9 edit .. //depot/projects/smpng/sys/arm/arm/undefined.c#10 edit .. //depot/projects/smpng/sys/kern/kern_kse.c#29 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#63 (text+ko) ==== @@ -405,8 +405,12 @@ case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); + PROC_LOCK(p); + _PHOLD(p); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; + _PRELE(p); + PROC_UNLOCK(p); mtx_unlock(&Giant); } ucode = a0; /* trap type */ ==== //depot/projects/smpng/sys/alpha/include/ptrace.h#9 (text+ko) ==== @@ -34,7 +34,11 @@ #define _MACHINE_PTRACE_H_ #ifdef _KERNEL -#define FIX_SSTEP(p) ptrace_clear_single_step(p) +#define FIX_SSTEP(p) do { \ + _PHOLD((p)); \ + ptrace_clear_single_step((p)); \ + _PRELE((p)); \ +} while (0) #endif #endif ==== //depot/projects/smpng/sys/arm/arm/undefined.c#10 (text+ko) ==== @@ -261,7 +261,11 @@ break; if (fault_code & FAULT_USER && fault_instruction == PTRACE_BREAKPOINT) { + PROC_LOCK(td->td_proc); + _PHOLD(td->td_proc); ptrace_clear_single_step(td); + _PRELE(td->td_proc); + PROC_UNLOCK(td->td_proc); return; } ==== //depot/projects/smpng/sys/kern/kern_kse.c#29 (text+ko) ==== @@ -787,8 +787,13 @@ */ cpu_set_upcall_kse(newtd, newku->ku_func, newku->ku_mailbox, &newku->ku_stack); - if (p->p_flag & P_TRACED) + PROC_LOCK(p); + if (p->p_flag & P_TRACED) { + _PHOLD(p); ptrace_clear_single_step(newtd); + _PRELE(p); + } + PROC_UNLOCK(p); } } @@ -1381,8 +1386,13 @@ if (!(ku->ku_mflags & KMF_NOUPCALL)) { cpu_set_upcall_kse(td, ku->ku_func, ku->ku_mailbox, &ku->ku_stack); - if (p->p_flag & P_TRACED) + PROC_LOCK(p); + if (p->p_flag & P_TRACED) { + _PHOLD(p); ptrace_clear_single_step(td); + _PRELE(p); + } + PROC_UNLOCK(p); error = suword32(&ku->ku_mailbox->km_lwp, td->td_tid); if (error) From owner-p4-projects@FreeBSD.ORG Mon Feb 20 22:41: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 17D3816A423; Mon, 20 Feb 2006 22:41:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9A0F16A420 for ; Mon, 20 Feb 2006 22:41:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B7C343D48 for ; Mon, 20 Feb 2006 22:41:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1KMfNi7063031 for ; Mon, 20 Feb 2006 22:41:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1KMfNo8063028 for perforce@freebsd.org; Mon, 20 Feb 2006 22:41:23 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Feb 2006 22:41:23 GMT Message-Id: <200602202241.k1KMfNo8063028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92099 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, 20 Feb 2006 22:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92099 Change 92099 by jhb@jhb_slimer on 2006/02/20 22:40:44 - Do a single PHOLD around the actions of kern_ptrace(). - Fix the default error case to be in the default: case so we can just use break instead of goto out. Simplify a lot of cleanup and unlocking code as a result. Many ptrace actions are now back to just ptrace_foo(); break; - Revert PHOLD/PRELE in FIX_SSTEP as all callers already do it now. Affected files ... .. //depot/projects/smpng/sys/alpha/include/ptrace.h#10 edit .. //depot/projects/smpng/sys/kern/sys_process.c#51 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/ptrace.h#10 (text+ko) ==== @@ -34,11 +34,7 @@ #define _MACHINE_PTRACE_H_ #ifdef _KERNEL -#define FIX_SSTEP(p) do { \ - _PHOLD((p)); \ - ptrace_clear_single_step((p)); \ - _PRELE((p)); \ -} while (0) +#define FIX_SSTEP(p) ptrace_clear_single_step(p) #endif #endif ==== //depot/projects/smpng/sys/kern/sys_process.c#51 (text+ko) ==== @@ -658,11 +658,14 @@ break; } + /* Keep this process around until we finish this request. */ + _PHOLD(p); + #ifdef FIX_SSTEP /* * Single step fixup ala procfs */ - FIX_SSTEP(td2); /* XXXKSE */ + FIX_SSTEP(td2); #endif /* @@ -676,9 +679,7 @@ /* set my trace flag and "owner" so it can read/write me */ p->p_flag |= P_TRACED; p->p_oppid = p->p_pptr->p_pid; - PROC_UNLOCK(p); - sx_xunlock(&proctree_lock); - return (0); + break; case PT_ATTACH: /* security check done above */ @@ -694,36 +695,24 @@ goto sendsig; /* in PT_CONTINUE below */ case PT_CLEARSTEP: - _PHOLD(p); error = ptrace_clear_single_step(td2); - _PRELE(p); - if (error) - goto fail; - PROC_UNLOCK(p); - return (0); + break; case PT_SETSTEP: - _PHOLD(p); error = ptrace_single_step(td2); - _PRELE(p); - if (error) - goto fail; - PROC_UNLOCK(p); - return (0); + break; case PT_SUSPEND: mtx_lock_spin(&sched_lock); td2->td_flags |= TDF_DBSUSPEND; mtx_unlock_spin(&sched_lock); - PROC_UNLOCK(p); - return (0); + break; case PT_RESUME: mtx_lock_spin(&sched_lock); td2->td_flags &= ~TDF_DBSUSPEND; mtx_unlock_spin(&sched_lock); - PROC_UNLOCK(p); - return (0); + break; case PT_STEP: case PT_CONTINUE: @@ -734,18 +723,14 @@ /* Zero means do not send any signal */ if (data < 0 || data > _SIG_MAXSIG) { error = EINVAL; - goto fail; + break; } - _PHOLD(p); - switch (req) { case PT_STEP: error = ptrace_single_step(td2); - if (error) { - _PRELE(p); - goto fail; - } + if (error) + goto out; break; case PT_TO_SCE: p->p_stops |= S_PT_SCE; @@ -760,12 +745,9 @@ if (addr != (void *)1) { error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr); - if (error) { - _PRELE(p); - goto fail; - } + if (error) + break; } - _PRELE(p); if (req == PT_DETACH) { /* reset process parent */ @@ -795,8 +777,10 @@ } sendsig: - if (proctree_locked) + if (proctree_locked) { sx_xunlock(&proctree_lock); + proctree_locked = 0; + } /* deliver or queue signal */ mtx_lock_spin(&sched_lock); td2->td_flags &= ~TDF_XSIG; @@ -827,8 +811,7 @@ if (data) psignal(p, data); - PROC_UNLOCK(p); - return (0); + break; case PT_WRITE_I: case PT_WRITE_D: @@ -836,7 +819,6 @@ /* FALLTHROUGH */ case PT_READ_I: case PT_READ_D: - _PHOLD(p); PROC_UNLOCK(p); tmp = 0; /* write = 0 set above */ @@ -850,7 +832,6 @@ uio.uio_rw = write ? UIO_WRITE : UIO_READ; uio.uio_td = td; error = proc_rwmem(p, &uio); - PRELE(p); if (uio.uio_resid != 0) { /* * XXX proc_rwmem() doesn't currently return ENOSPC, @@ -866,11 +847,10 @@ } if (!write) td->td_retval[0] = tmp; - return (error); + PROC_LOCK(p); + break; case PT_IO: - _PHOLD(p); - PROC_UNLOCK(p); #ifdef COMPAT_IA32 if (wrap32) { piod32 = addr; @@ -906,69 +886,52 @@ uio.uio_rw = UIO_WRITE; break; default: - PRELE(p); - return (EINVAL); + error = EINVAL; + goto out; } + PROC_UNLOCK(p); error = proc_rwmem(p, &uio); - PRELE(p); #ifdef COMPAT_IA32 if (wrap32) piod32->piod_len -= uio.uio_resid; else #endif piod->piod_len -= uio.uio_resid; - return (error); + PROC_LOCK(p); + break; case PT_KILL: data = SIGKILL; goto sendsig; /* in PT_CONTINUE above */ case PT_SETREGS: - _PHOLD(p); error = PROC_WRITE(regs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_GETREGS: - _PHOLD(p); error = PROC_READ(regs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_SETFPREGS: - _PHOLD(p); error = PROC_WRITE(fpregs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_GETFPREGS: - _PHOLD(p); error = PROC_READ(fpregs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_SETDBREGS: - _PHOLD(p); error = PROC_WRITE(dbregs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_GETDBREGS: - _PHOLD(p); error = PROC_READ(dbregs, td2, addr); - _PRELE(p); - PROC_UNLOCK(p); - return (error); + break; case PT_LWPINFO: if (data == 0 || data > sizeof(*pl)) { error = EINVAL; - goto fail; + break; } pl = addr; pl->pl_lwpid = td2->td_tid; @@ -983,21 +946,18 @@ } else { pl->pl_flags = 0; } - PROC_UNLOCK(p); - return (0); + break; case PT_GETNUMLWPS: td->td_retval[0] = p->p_numthreads; - PROC_UNLOCK(p); - return (0); + break; case PT_GETLWPLIST: if (data <= 0) { error = EINVAL; - goto fail; + break; } num = imin(p->p_numthreads, data); - _PHOLD(p); PROC_UNLOCK(p); buf = malloc(num * sizeof(lwpid_t), M_TEMP, M_WAITOK); tmp = 0; @@ -1009,30 +969,30 @@ buf[tmp++] = td2->td_tid; } mtx_unlock_spin(&sched_lock); - _PRELE(p); PROC_UNLOCK(p); error = copyout(buf, addr, tmp * sizeof(lwpid_t)); free(buf, M_TEMP); if (!error) td->td_retval[0] = num; - return (error); + PROC_LOCK(p); + break; default: #ifdef __HAVE_PTRACE_MACHDEP if (req >= PT_FIRSTMACH) { - _PHOLD(p); PROC_UNLOCK(p); error = cpu_ptrace(td2, req, addr, data); - PRELE(p); - return (error); - } + PROC_LOCK(p); + } else #endif + /* Unknown request. */ + error = EINVAL; break; } - /* Unknown request. */ - error = EINVAL; - +out: + /* Drop our hold on this process now that the request has completed. */ + _PRELE(p); fail: PROC_UNLOCK(p); if (proctree_locked) From owner-p4-projects@FreeBSD.ORG Mon Feb 20 22:42: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 C21E116A423; Mon, 20 Feb 2006 22:42:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CF0016A420 for ; Mon, 20 Feb 2006 22:42:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E70143D45 for ; Mon, 20 Feb 2006 22:42:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1KMgPw4063094 for ; Mon, 20 Feb 2006 22:42:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1KMgOoW063091 for perforce@freebsd.org; Mon, 20 Feb 2006 22:42:25 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Feb 2006 22:42:25 GMT Message-Id: <200602202242.k1KMgOoW063091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92100 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, 20 Feb 2006 22:42:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92100 Change 92100 by jhb@jhb_slimer on 2006/02/20 22:42:13 PHOLD not needed in proc_sstep() as it is already done in the caller. Affected files ... .. //depot/projects/smpng/sys/kern/sys_process.c#52 edit Differences ... ==== //depot/projects/smpng/sys/kern/sys_process.c#52 (text+ko) ==== @@ -204,9 +204,7 @@ proc_sstep(struct thread *td) { - _PHOLD(td->td_proc); PROC_ACTION(ptrace_single_step(td)); - _PRELE(td->td_proc); } int From owner-p4-projects@FreeBSD.ORG Tue Feb 21 04:09: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 93B3B16A423; Tue, 21 Feb 2006 04:09:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E81716A420 for ; Tue, 21 Feb 2006 04:09:11 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3E0543D49 for ; Tue, 21 Feb 2006 04:09:10 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L49Atp083031 for ; Tue, 21 Feb 2006 04:09:10 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L49AOj083028 for perforce@freebsd.org; Tue, 21 Feb 2006 04:09:10 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:09:10 GMT Message-Id: <200602210409.k1L49AOj083028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92109 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, 21 Feb 2006 04:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92109 Change 92109 by csjp@csjp_xor on 2006/02/21 04:09:03 CAPP says that failing to audit an auditable event should result in the event not happening. So, if auditing any of these events fails, terminate the process all together. Also, do not ignore au_write failures. This change needs to be made in the login(1) too. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#11 (text+ko) ==== @@ -650,13 +650,13 @@ return; syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", strerror(errno)); - return; + errx(1, "Permission denied"); } afd = au_open(); if (afd < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); - return; + errx(1, "Permission denied"); } /* XXX what should we do for termid? */ bzero(&termid, sizeof(termid)); @@ -666,10 +666,13 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - /* XXX what if au_fails? */ - (void) au_write(afd, token); if (fmt != NULL) { va_start(ap, fmt); (void) vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); @@ -678,9 +681,13 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: failed to generate text token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - (void) au_write(afd, token); } switch (what) { case AUDIT_SU_FAILURE: @@ -693,10 +700,16 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: enable to build return token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - (void) au_write(afd, token); - if (au_close(afd, 1, AUE_su) < 0) + if (au_close(afd, 1, AUE_su) < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); + errx(1, "Permission denied"); + } } #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 21 04:12: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 BDD6616A423; Tue, 21 Feb 2006 04:12:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6969716A420 for ; Tue, 21 Feb 2006 04:12:15 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 211F143D46 for ; Tue, 21 Feb 2006 04:12:15 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L4CFZt083204 for ; Tue, 21 Feb 2006 04:12:15 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L4CERS083201 for perforce@freebsd.org; Tue, 21 Feb 2006 04:12:14 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:12:14 GMT Message-Id: <200602210412.k1L4CERS083201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92110 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, 21 Feb 2006 04:12:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92110 Change 92110 by csjp@csjp_xor on 2006/02/21 04:11:49 Actually check the audit condition. Somewhere along the way this got dropped. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#12 (text+ko) ==== @@ -652,6 +652,8 @@ strerror(errno)); errx(1, "Permission denied"); } + if (acond == AUC_NOAUDIT) + return; afd = au_open(); if (afd < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", From owner-p4-projects@FreeBSD.ORG Tue Feb 21 04:21: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 7E09016A423; Tue, 21 Feb 2006 04:21:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AC5116A422 for ; Tue, 21 Feb 2006 04:21:27 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACC4243D46 for ; Tue, 21 Feb 2006 04:21:26 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L4LQQq083602 for ; Tue, 21 Feb 2006 04:21:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L4LQc7083599 for perforce@freebsd.org; Tue, 21 Feb 2006 04:21:26 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:21:26 GMT Message-Id: <200602210421.k1L4LQc7083599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92111 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, 21 Feb 2006 04:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92111 Change 92111 by csjp@csjp_xor on 2006/02/21 04:21:22 Conditionally compile the login_audit and in login.c conditionally compile in calls to audit functions. This behaviour differs a bit from my previous change, where the audit functions were NOPs in the event audit was not wanted. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#15 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#15 (text+ko) ==== @@ -292,19 +292,25 @@ pam_err = pam_start("login", username, &pamc, &pamh); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_start()"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_TTY)"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_RHOST, hostname); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_RHOST)"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } @@ -338,7 +344,9 @@ * We are not exiting here, but this corresponds to a failed * login event, so set exitstatus to 1. */ +#ifdef USE_BSM_AUDIT au_login_fail("Login incorrect", 1); +#endif (void)printf("Login incorrect\n"); failures++; @@ -362,9 +370,11 @@ endpwent(); +#ifdef USE_BSM_AUDIT /* Audit successful login. */ if (auditsuccess) au_login_success(); +#endif /* * Establish the login class. @@ -951,7 +961,9 @@ { pam_cleanup(); +#ifdef USE_BSM_AUDIT audit_logout(); +#endif (void)sleep(sec); exit(eval); } ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#11 (text+ko) ==== @@ -46,6 +46,7 @@ #include "login.h" +#ifdef USE_BSM_AUDIT /* * Audit data */ @@ -58,7 +59,6 @@ void au_login_success(void) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -103,7 +103,6 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Record was not committed."); -#endif /* USE_BSM_AUDIT */ } /* @@ -113,7 +112,6 @@ void au_login_fail(char *errmsg, int na) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; long au_cond; @@ -162,7 +160,6 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Error: au_close() was not committed"); -#endif /* USE_BSM_AUDIT */ } /* @@ -172,7 +169,6 @@ void audit_logout(void) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -206,5 +202,5 @@ if (au_close(aufd, 1, AUE_logout) == -1) errx(1, "login: Audit Record was not committed."); +} #endif /* USE_BSM_AUDIT */ -} From owner-p4-projects@FreeBSD.ORG Tue Feb 21 05:11: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 BDAE916A423; Tue, 21 Feb 2006 05:11:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7912F16A420 for ; Tue, 21 Feb 2006 05:11:28 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 331A843D45 for ; Tue, 21 Feb 2006 05:11:28 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L5BS7E092641 for ; Tue, 21 Feb 2006 05:11:28 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L5BRlJ092638 for perforce@freebsd.org; Tue, 21 Feb 2006 05:11:27 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 05:11:27 GMT Message-Id: <200602210511.k1L5BRlJ092638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92112 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, 21 Feb 2006 05:11:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92112 Change 92112 by csjp@csjp_xor on 2006/02/21 05:10:49 Overhaul error handling logic here. The subject shouldn't know anything about the auditing configuration concerning them. So, instead of printing errors to stderr which gives away information about auditing config, print a vague message to stderr and log the details to syslog (LOG_AUTH|LOG_ERR). This is a CAPP requirement. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#12 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include "login.h" @@ -72,37 +73,55 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - err(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "Could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; /* Compute and set the user's preselection mask. */ - if (au_user_mask(pwd->pw_name, &aumask) == -1) - errx(1, "login: Could not set audit mask\n"); + if (au_user_mask(pwd->pw_name, &aumask) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "Could not set audit mask: %s", strerror(errno)); + errx(1, "Permission denied"); + } /* Set the audit info for the user. */ auinfo.ai_auid = uid; auinfo.ai_asid = pid; bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); - if (setaudit(&auinfo) != 0) - err(1, "login: setaudit failed"); + if (setaudit(&auinfo) != 0) { + syslog(LOG_AUTH | LOG_ERR, "setaudit failed: %s", + strerror(errno)); + errx(1, "Permission denied"); + } - if ((aufd = au_open()) == -1) - errx(1,"login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + errx(1,"Permission denied"); + } if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, - pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(0, 0)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) - errx(1, "login: Audit Record was not committed."); + if (au_close(aufd, 1, AUE_login) == -1) { + syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); + errx(1, "Permission denied"); + } } /* @@ -123,13 +142,19 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - err(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) - errx(1, "login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (na) { /* @@ -137,29 +162,41 @@ * within a user's session => auid,asid == -1. */ if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, - pid, -1, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, -1, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } } else { /* We know the subject -- so use its value instead. */ uid = pwd->pw_uid; gid = pwd->pw_gid; if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, - gid, pid, pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + gid, pid, pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } } au_write(aufd, tok); /* Include the error message. */ - if ((tok = au_to_text(errmsg)) == NULL) - errx(1, "login: Audit Error: au_to_text() failed"); + if ((tok = au_to_text(errmsg)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(1, errno)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(1, errno)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_return32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) - errx(1, "login: Audit Error: au_close() was not committed"); + if (au_close(aufd, 1, AUE_login) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_close() was not committed"); + errx(1, "Permission denied"); + } } /* @@ -182,25 +219,39 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - errx(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "login: Could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) - errx(1, "login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_open() failed"); + errx(1, "Permission denied"); + } /* The subject that is created (euid, egid of the current process). */ if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, - pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_subject32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(0, 0)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_return32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_logout) == -1) - errx(1, "login: Audit Record was not committed."); + if (au_close(aufd, 1, AUE_logout) == -1) { + syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); + errx(1, "Permission denied"); + } } #endif /* USE_BSM_AUDIT */ From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:03:44 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 C7F5316A423; Tue, 21 Feb 2006 07:03:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D43916A420 for ; Tue, 21 Feb 2006 07:03:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2793743D48 for ; Tue, 21 Feb 2006 07:03:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L73htX096511 for ; Tue, 21 Feb 2006 07:03:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L73gwp096508 for perforce@freebsd.org; Tue, 21 Feb 2006 07:03:42 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:03:42 GMT Message-Id: <200602210703.k1L73gwp096508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92113 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, 21 Feb 2006 07:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92113 Change 92113 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:03:07 move constants needed by to interface with hypervisor into un-encumbered file Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#2 (text+ko) ==== @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _SYS_HYPERVISOR_API_H -#define _SYS_HYPERVISOR_API_H +#ifndef _MACHINE_HYPERVISOR_API_H +#define _MACHINE_HYPERVISOR_API_H /* * sun4v Hypervisor API @@ -37,287 +37,7 @@ #ifdef __cplusplus extern "C" { #endif - -/* - * Trap types - */ -#define FAST_TRAP 0x80 /* Function # in %o5 */ -#define CPU_TICK_NPT 0x81 -#define CPU_STICK_NPT 0x82 -#define MMU_MAP_ADDR 0x83 -#define MMU_UNMAP_ADDR 0x84 - -/* - * Error returns in %o0. - * (Additional result is returned in %o1.) - */ -#define H_EOK 0 /* Successful return */ -#define H_ENOCPU 1 /* Invalid CPU id */ -#define H_ENORADDR 2 /* Invalid real address */ -#define H_ENOINTR 3 /* Invalid interrupt id */ -#define H_EBADPGSZ 4 /* Invalid pagesize encoding */ -#define H_EBADTSB 5 /* Invalid TSB description */ -#define H_EINVAL 6 /* Invalid argument */ -#define H_EBADTRAP 7 /* Invalid function number */ -#define H_EBADALIGN 8 /* Invalid address alignment */ -#define H_EWOULDBLOCK 9 /* Cannot complete operation */ - /* without blocking */ -#define H_ENOACCESS 10 /* No access to resource */ -#define H_EIO 11 /* I/O error */ -#define H_ECPUERROR 12 /* CPU is in error state */ -#define H_ENOTSUPPORTED 13 /* Function not supported */ -#define H_ENOMAP 14 /* Mapping is not valid, */ - /* no translation exists */ - -#define H_BREAK -1 /* Console Break */ -#define H_HUP -2 /* Console Break */ - -/* - * Mondo CPU ID argument processing. - */ -#define HV_SEND_MONDO_ENTRYDONE 0xffff - -/* - * Function numbers for FAST_TRAP. - */ -#define HV_MACH_EXIT 0x00 -#define HV_MACH_DESC 0x01 -#define HV_CPU_YIELD 0x12 -#define CPU_QCONF 0x14 -#define HV_CPU_STATE 0x17 -#define MMU_TSB_CTX0 0x20 -#define MMU_TSB_CTXNON0 0x21 -#define MMU_DEMAP_PAGE 0x22 -#define MMU_DEMAP_CTX 0x23 -#define MMU_DEMAP_ALL 0x24 -#define MAP_PERM_ADDR 0x25 -#define MMU_SET_INFOPTR 0x26 -#define UNMAP_PERM_ADDR 0x28 -#define HV_MEM_SCRUB 0x31 -#define HV_MEM_SYNC 0x32 -#define HV_INTR_SEND 0x42 -#define TOD_GET 0x50 -#define TOD_SET 0x51 -#define CONS_READ 0x60 -#define CONS_WRITE 0x61 - -#define SVC_SEND 0x80 -#define SVC_RECV 0x81 -#define SVC_GETSTATUS 0x82 -#define SVC_SETSTATUS 0x83 -#define SVC_CLRSTATUS 0x84 - -#define TTRACE_BUF_CONF 0x90 -#define TTRACE_BUF_INFO 0x91 -#define TTRACE_ENABLE 0x92 -#define TTRACE_FREEZE 0x93 - -#define DUMP_BUF_UPDATE 0x94 - -#define HVIO_INTR_DEVINO2SYSINO 0xa0 -#define HVIO_INTR_GETVALID 0xa1 -#define HVIO_INTR_SETVALID 0xa2 -#define HVIO_INTR_GETSTATE 0xa3 -#define HVIO_INTR_SETSTATE 0xa4 -#define HVIO_INTR_GETTARGET 0xa5 -#define HVIO_INTR_SETTARGET 0xa6 - -#define HVIO_IOMMU_MAP 0xb0 -#define HVIO_IOMMU_DEMAP 0xb1 -#define HVIO_IOMMU_GETMAP 0xb2 -#define HVIO_IOMMU_GETBYPASS 0xb3 - -#define HVIO_CONFIG_GET 0xb4 -#define HVIO_CONFIG_PUT 0xb5 - -#define HVIO_PEEK 0xb6 -#define HVIO_POKE 0xb7 - -#define HVIO_DMA_SYNC 0xb8 - -#define HVIO_MSIQ_CONF 0xc0 -#define HVIO_MSIQ_INFO 0xc1 -#define HVIO_MSIQ_GETVALID 0xc2 -#define HVIO_MSIQ_SETVALID 0xc3 -#define HVIO_MSIQ_GETSTATE 0xc4 -#define HVIO_MSIQ_SETSTATE 0xc5 -#define HVIO_MSIQ_GETHEAD 0xc6 -#define HVIO_MSIQ_SETHEAD 0xc7 -#define HVIO_MSIQ_GETTAIL 0xc8 - -#define HVIO_MSI_GETVALID 0xc9 -#define HVIO_MSI_SETVALID 0xca -#define HVIO_MSI_GETMSIQ 0xcb -#define HVIO_MSI_SETMSIQ 0xcc -#define HVIO_MSI_GETSTATE 0xcd -#define HVIO_MSI_SETSTATE 0xce - -#define HVIO_MSG_GETMSIQ 0xd0 -#define HVIO_MSG_SETMSIQ 0xd1 -#define HVIO_MSG_GETVALID 0xd2 -#define HVIO_MSG_SETVALID 0xd3 - -#ifdef SET_MMU_STATS -#define MMU_STAT_AREA 0xfc -#endif /* SET_MMU_STATS */ - -#define HV_NCS_REQUEST 0x110 - -#define FIRE_GET_PERFREG 0x120 -#define FIRE_SET_PERFREG 0x121 - -#define HV_RA2PA 0x200 -#define HV_HPRIV 0x201 - -/* - * Bits for MMU functions flags argument: - * arg3 of MMU_MAP_ADDR - * arg3 of MMU_DEMAP_CTX - * arg2 of MMU_DEMAP_ALL - */ -#define MAP_DTLB 0x1 -#define MAP_ITLB 0x2 - - -/* - * Interrupt state manipulation definitions. - */ - -#define HV_INTR_IDLE_STATE 0 -#define HV_INTR_RECEIVED_STATE 1 -#define HV_INTR_DELIVERED_STATE 2 - -#define HV_INTR_NOTVALID 0 -#define HV_INTR_VALID 1 - -#ifndef _ASM - -/* - * TSB description structure for MMU_TSB_CTX0 and MMU_TSB_CTXNON0. - */ -typedef struct hv_tsb_info { - uint16_t hvtsb_idxpgsz; /* page size used to index TSB */ - uint16_t hvtsb_assoc; /* TSB associativity */ - uint32_t hvtsb_ntte; /* TSB size (#TTE entries) */ - uint32_t hvtsb_ctx_index; /* context reg index */ - uint32_t hvtsb_pgszs; /* sizes in use */ - uint64_t hvtsb_pa; /* real address of TSB base */ - uint64_t hvtsb_rsvd; /* reserved */ -} hv_tsb_info_t; - -#define HVTSB_SHARE_INDEX ((uint32_t)-1) - -#ifdef SET_MMU_STATS -#ifndef TTE4V_NPGSZ -#define TTE4V_NPGSZ 8 -#endif /* TTE4V_NPGSZ */ -/* - * MMU statistics structure for MMU_STAT_AREA - */ -struct mmu_stat_one { - uint64_t hit_ctx0[TTE4V_NPGSZ]; - uint64_t hit_ctxn0[TTE4V_NPGSZ]; - uint64_t tsb_miss; - uint64_t tlb_miss; /* miss, no TSB set */ - uint64_t map_ctx0[TTE4V_NPGSZ]; - uint64_t map_ctxn0[TTE4V_NPGSZ]; -}; - -struct mmu_stat { - struct mmu_stat_one immu_stat; - struct mmu_stat_one dmmu_stat; - uint64_t set_ctx0; - uint64_t set_ctxn0; -}; -#endif /* SET_MMU_STATS */ - -#endif /* _ASM */ - -/* - * CPU States - */ -#define CPU_STATE_INVALID 0x0 -#define CPU_STATE_IDLE 0x1 /* cpu not started */ -#define CPU_STATE_GUEST 0x2 /* cpu running guest code */ -#define CPU_STATE_ERROR 0x3 /* cpu is in the error state */ -#define CPU_STATE_LAST_PUBLIC CPU_STATE_ERROR /* last valid state */ - -/* - * MMU fault status area - */ - -#define MMFSA_TYPE_ 0x00 /* fault type */ -#define MMFSA_ADDR_ 0x08 /* fault address */ -#define MMFSA_CTX_ 0x10 /* fault context */ - -#define MMFSA_I_ 0x00 /* start of fields for I */ -#define MMFSA_I_TYPE (MMFSA_I_ + MMFSA_TYPE_) /* instruction fault type */ -#define MMFSA_I_ADDR (MMFSA_I_ + MMFSA_ADDR_) /* instruction fault address */ -#define MMFSA_I_CTX (MMFSA_I_ + MMFSA_CTX_) /* instruction fault context */ - -#define MMFSA_D_ 0x40 /* start of fields for D */ -#define MMFSA_D_TYPE (MMFSA_D_ + MMFSA_TYPE_) /* data fault type */ -#define MMFSA_D_ADDR (MMFSA_D_ + MMFSA_ADDR_) /* data fault address */ -#define MMFSA_D_CTX (MMFSA_D_ + MMFSA_CTX_) /* data fault context */ - -#define MMFSA_F_FMISS 1 /* fast miss */ -#define MMFSA_F_FPROT 2 /* fast protection */ -#define MMFSA_F_MISS 3 /* mmu miss */ -#define MMFSA_F_INVRA 4 /* invalid RA */ -#define MMFSA_F_PRIV 5 /* privilege violation */ -#define MMFSA_F_PROT 6 /* protection violation */ -#define MMFSA_F_NFO 7 /* NFO access */ -#define MMFSA_F_SOPG 8 /* so page */ -#define MMFSA_F_INVVA 9 /* invalid VA */ -#define MMFSA_F_INVASI 10 /* invalid ASI */ -#define MMFSA_F_NCATM 11 /* non-cacheable atomic */ -#define MMFSA_F_PRVACT 12 /* privileged action */ -#define MMFSA_F_WPT 13 /* watchpoint hit */ -#define MMFSA_F_UNALIGN 14 /* unaligned access */ -#define MMFSA_F_INVPGSZ 15 /* invalid page size */ - -#define MMFSA_SIZE 0x80 /* in bytes, 64 byte aligned */ - -/* - * MMU fault status - MMFSA_IFS and MMFSA_DFS - */ -#define MMFS_FV 0x00000001 -#define MMFS_OW 0x00000002 -#define MMFS_W 0x00000004 -#define MMFS_PR 0x00000008 -#define MMFS_CT 0x00000030 -#define MMFS_E 0x00000040 -#define MMFS_FT 0x00003f80 -#define MMFS_ME 0x00004000 -#define MMFS_TM 0x00008000 -#define MMFS_ASI 0x00ff0000 -#define MMFS_NF 0x01000000 - -/* - * DMA sync parameter definitions - */ -#define HVIO_DMA_SYNC_DIR_TO_DEV 0x01 -#define HVIO_DMA_SYNC_DIR_FROM_DEV 0x02 - -/* - * Performance counter register definitions. - */ -#define HVIO_FIRE_PERFREG_JBC_SEL 0 -#define HVIO_FIRE_PERFREG_JBC_CNT0 1 -#define HVIO_FIRE_PERFREG_JBC_CNT1 2 -#define HVIO_FIRE_PERFREG_PCIE_IMU_SEL 3 -#define HVIO_FIRE_PERFREG_PCIE_IMU_CNT0 4 -#define HVIO_FIRE_PERFREG_PCIE_IMU_CNT1 5 -#define HVIO_FIRE_PERFREG_PCIE_MMU_SEL 6 -#define HVIO_FIRE_PERFREG_PCIE_MMU_CNT0 7 -#define HVIO_FIRE_PERFREG_PCIE_MMU_CNT1 8 -#define HVIO_FIRE_PERFREG_PCIE_TLU_SEL 9 -#define HVIO_FIRE_PERFREG_PCIE_TLU_CNT0 10 -#define HVIO_FIRE_PERFREG_PCIE_TLU_CNT1 11 -#define HVIO_FIRE_PERFREG_PCIE_TLU_CNT2 12 -#define HVIO_FIRE_PERFREG_PCIE_LNK_SEL 13 -#define HVIO_FIRE_PERFREG_PCIE_LNK_CNT1 14 -#define HVIO_FIRE_PERFREG_PCIE_LNK_CNT2 15 +#include #ifndef _ASM @@ -378,4 +98,4 @@ } #endif -#endif /* _SYS_HYPERVISOR_API_H */ +#endif /* _MACHINE_HYPERVISOR_API_H */ From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:05: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 95CCC16A423; Tue, 21 Feb 2006 07:05:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7179616A420 for ; Tue, 21 Feb 2006 07:05:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 217F443D46 for ; Tue, 21 Feb 2006 07:05:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L75k9c096609 for ; Tue, 21 Feb 2006 07:05:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L75jd3096606 for perforce@freebsd.org; Tue, 21 Feb 2006 07:05:45 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:05:45 GMT Message-Id: <200602210705.k1L75jd3096606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92114 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, 21 Feb 2006 07:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92114 Change 92114 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:05:04 remove reference to constants not used in sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#3 (text+ko) ==== @@ -99,7 +99,6 @@ ASSYM(TLB_DEMAP_PRIMARY, TLB_DEMAP_PRIMARY); ASSYM(TLB_DEMAP_CONTEXT, TLB_DEMAP_CONTEXT); ASSYM(TLB_DEMAP_PAGE, TLB_DEMAP_PAGE); -ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK); ASSYM(TSB_BUCKET_MASK, TSB_BUCKET_MASK); ASSYM(TSB_BUCKET_SHIFT, TSB_BUCKET_SHIFT); @@ -151,9 +150,10 @@ ASSYM(KTR_PARM5, offsetof(struct ktr_entry, ktr_parms[4])); ASSYM(KTR_PARM6, offsetof(struct ktr_entry, ktr_parms[5])); +ASSYM(TTE_SHIFT, TTE_SHIFT); +#ifndef SUN4V ASSYM(TTE_VPN, offsetof(struct tte, tte_vpn)); ASSYM(TTE_DATA, offsetof(struct tte, tte_data)); -ASSYM(TTE_SHIFT, TTE_SHIFT); ASSYM(TD_EXEC, TD_EXEC); ASSYM(TD_REF, TD_REF); @@ -167,8 +167,9 @@ ASSYM(TS_MIN, TS_MIN); ASSYM(TS_MAX, TS_MAX); - +ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK); ASSYM(TV_SIZE_BITS, TV_SIZE_BITS); +#endif ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); @@ -183,7 +184,6 @@ ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); -ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); @@ -197,6 +197,9 @@ ASSYM(PC_RQ_SIZE, offsetof(struct pcpu, pc_rq_size)); ASSYM(PC_NRQ_BASE, offsetof(struct pcpu, pc_nrq_ra)); ASSYM(PC_NRQ_SIZE, offsetof(struct pcpu, pc_nrq_size)); +#else +ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); +ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); #endif @@ -261,7 +264,7 @@ ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context)); -ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); + ASSYM(SF_UC, offsetof(struct sigframe, sf_uc)); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:08:51 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 1518F16A423; Tue, 21 Feb 2006 07:08:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC32C16A420 for ; Tue, 21 Feb 2006 07:08:50 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7846743D49 for ; Tue, 21 Feb 2006 07:08:50 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L78oZR096716 for ; Tue, 21 Feb 2006 07:08:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L78oW0096713 for perforce@freebsd.org; Tue, 21 Feb 2006 07:08:50 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:08:50 GMT Message-Id: <200602210708.k1L78oW0096713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92115 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, 21 Feb 2006 07:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92115 Change 92115 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:08:16 add a couple of functions to ofw support for mmu queries and trap table Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm_mmu.c#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.c#2 (text+ko) ==== @@ -73,7 +73,6 @@ static ihandle_t stdout; /* Initialiaser */ - void OF_init(int (*openfirm)(void *)) { @@ -85,6 +84,23 @@ OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)); } + +phandle_t +OF_chosennode(void) +{ + static phandle_t chosen; + + if (chosen) + return (chosen); + + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + + return (chosen); +} + + + void OF_printf(const char *fmt, ...) { @@ -814,3 +830,38 @@ entry(0, 0, openfirmware, arg, len); } #endif + +/* + * Extensions added for sun4v support + * + */ + + +/* + * This interface allows the client to safely take over the %tba by + * the prom's service. The prom will take care of the quiescence of + * interrupts and handle any pending soft interrupts. + * This call also sets the MMU fault status area for the cpu. + */ +void +OF_set_mmfsa_traptable(void *tba_addr, uint64_t mmfsa_ra) +{ + static struct { + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t tba_addr; + cell_t mmfsa_ra; + } args = { + (cell_t)"SUNW,set-trap-table", + 2, + 0, + }; + + args.tba_addr = (cell_t)tba_addr; + args.mmfsa_ra = (cell_t)mmfsa_ra; + openfirmware(&args); +} + + + ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ phandle_t OF_child(phandle_t); phandle_t OF_parent(phandle_t); phandle_t OF_instance_to_package(ihandle_t); +phandle_t OF_chosennode(void); int OF_getproplen(phandle_t, char *); int OF_getprop(phandle_t, char *, void *, int); int OF_getprop_alloc(phandle_t package, char *propname, int elsz, @@ -138,5 +139,10 @@ /* Time function */ int OF_milliseconds(void); +/* sun4v additions */ +void OF_set_mmfsa_traptable(void *tba_addr, uint64_t mmfsa_ra); +int OF_translate_virt(vm_offset_t va, int *valid, vm_paddr_t *physaddr, int *mode); +vm_paddr_t OF_vtophys(vm_offset_t va); + #endif /* _KERNEL */ #endif /* _OPENFIRM_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:14: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 58C9A16A423; Tue, 21 Feb 2006 07:14:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E91C016A420 for ; Tue, 21 Feb 2006 07:14:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC2E443D5F for ; Tue, 21 Feb 2006 07:14:21 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L7ELou096972 for ; Tue, 21 Feb 2006 07:14:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L7EKNJ096966 for perforce@freebsd.org; Tue, 21 Feb 2006 07:14:20 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:14:20 GMT Message-Id: <200602210714.k1L7EKNJ096966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92116 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, 21 Feb 2006 07:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92116 Change 92116 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:13:19 add back rwindow.c - still needed by signal handler update files.sun4v ifdef out parts of machdep files to fix linker complaints Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/rwindow.c#3 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#5 (text+ko) ==== @@ -25,6 +25,7 @@ dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard +dev/ofw/openfirm_mmu.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard dev/uart/uart_cpu_sparc64.c optional uart @@ -68,12 +69,12 @@ sun4v/sun4v/ofw_machdep.c standard sun4v/sun4v/pmap.c standard sun4v/sun4v/prof_machdep.c optional profiling-routine -sun4v/sun4v/rwindow.c standard +sun4v/sun4v/rwindow.c standard sun4v/sun4v/support.S standard sun4v/sun4v/sys_machdep.c standard sun4v/sun4v/swtch.S standard -sun4v/sun4v/tlb.c standard sun4v/sun4v/tsb.c standard +sun4v/sun4v/tte.c standard sun4v/sun4v/tick.c standard sun4v/sun4v/trap.c standard sun4v/sun4v/uio_machdep.c standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#3 (text+ko) ==== @@ -701,6 +701,7 @@ sparc64_bus_mem_map(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t size, int flags, vm_offset_t vaddr, void **hp) { +#if 0 vm_offset_t addr; vm_offset_t sva; vm_offset_t va; @@ -751,12 +752,14 @@ pa += PAGE_SIZE; } while ((vsz -= PAGE_SIZE) > 0); tlb_range_demap(kernel_pmap, sva, sva + size - 1); +#endif return (0); } int sparc64_bus_mem_unmap(void *bh, bus_size_t size) { +#if 0 vm_offset_t sva; vm_offset_t va; vm_offset_t endva; @@ -767,6 +770,7 @@ pmap_kremove_flags(va); tlb_range_demap(kernel_pmap, sva, sva + size - 1); kmem_free(kernel_map, sva, size); +#endif return (0); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#3 (text+ko) ==== @@ -41,8 +41,9 @@ #include #include #include +#include #include -#include + CTASSERT(sizeof(struct kerneldumpheader) == DEV_BSIZE); @@ -144,7 +145,9 @@ printf("%c\b", "|/-\\"[twiddle++ & 3]); rsz = size - pos; rsz = (rsz > MAXDUMPSZ) ? MAXDUMPSZ : rsz; +#ifdef notyet va = TLB_PHYS_TO_DIRECT(pa + pos); +#endif error = di->dumper(di->priv, (void *)va, 0, dumplo, rsz); if (error) break; @@ -202,8 +205,11 @@ /* Dump the private header. */ hdr.dh_hdr_size = hdrsize; +#ifdef notyet + /* XXX SUN4V_FIXME */ hdr.dh_tsb_pa = tsb_kernel_phys; hdr.dh_tsb_size = tsb_kernel_size; +#endif hdr.dh_nregions = nreg; if (buf_write(di, (char *)&hdr, sizeof(hdr)) != 0) From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:33: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 AE87216A424; Tue, 21 Feb 2006 07:33:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6912516A422 for ; Tue, 21 Feb 2006 07:33:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BE8243D78 for ; Tue, 21 Feb 2006 07:33:45 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L7XjDl097888 for ; Tue, 21 Feb 2006 07:33:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L7XiNf097883 for perforce@freebsd.org; Tue, 21 Feb 2006 07:33:44 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:33:44 GMT Message-Id: <200602210733.k1L7XiNf097883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92117 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, 21 Feb 2006 07:33:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92117 Change 92117 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:33:10 separate sun4v specific cpufunc into sun4v_cpufunc.h add page directory to pcb rename per-cpu pmap to curpmap make ptov more sensible by using pv_entrys remove useless PMAP_STATS import solaris' bad trap level defines add defines for TSB manipulation simplify tsb manipulation to straightforward get / set simplify tte manipulation with get/set/clear functions gut wstate.h - switch to solaris' model of wstate usage add skeleton wbuf.S for spill / fill exceptions ifdef out references to old WSTATE defines in exception.S import panic_bad_hcall into hcall.S shuffle calls in sparc64_init into safer order pmap.c is starting to fall into place - where possible import bits from i386' pmap.c - basic tsb manipulation is in place - tte manipulation appears somewhat sano add pmap related calls (invlpg, invlctx, invltlb, set_pdir_scratchpad, and load_real_dw) to support.S #ifdef out currently invalid bits in swtch.S enable ofw setting of trap table in trap.c re-write tsb.c from scratch currently only has get / set functions remove PMAP_STATS reference from vm_machdep.c Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_types.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/wstate.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/_types.h#2 (text+ko) ==== @@ -55,7 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ -typedef unsigned int __cpumask_t; +typedef __uint64_t __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#4 (text+ko) ==== @@ -224,33 +224,8 @@ void ascopyfrom(u_long sasi, vm_offset_t src, caddr_t dst, size_t len); void ascopyto(caddr_t src, u_long dasi, vm_offset_t dst, size_t len); void aszero(u_long asi, vm_offset_t dst, size_t len); -void set_mmfsa_scratchpad(vm_paddr_t mmfsa); -void setwstate(u_long wstate); -void set_tba(void *tba); -/* - * Ultrasparc II doesn't implement popc in hardware. Suck. - */ -#if 0 -#define HAVE_INLINE_FFS -/* - * See page 202 of the SPARC v9 Architecture Manual. - */ -static __inline int -ffs(int mask) -{ - int result; - int neg; - int tmp; - __asm __volatile( - " neg %3, %1 ; " - " xnor %3, %1, %2 ; " - " popc %2, %0 ; " - " movrz %3, %%g0, %0 ; " - : "=r" (result), "=r" (neg), "=r" (tmp) : "r" (mask)); - return (result); -} -#endif +#include #undef LDNC_GEN #undef STNC_GEN ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#4 (text+ko) ==== @@ -131,5 +131,10 @@ #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) +#define NPGPTD 1 /* number of page table directory pages */ +#define NBPTD (NPGPTD << PAGE_SHIFT) /* number of bytes in a page table directory */ +#define NPDEPG (PAGE_SIZE/(sizeof (vm_offset_t))) + + #endif /* !_MACHINE_PARAM_H_ */ #endif /* !_NO_NAMESPACE_POLLUTION */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#2 (text+ko) ==== @@ -45,7 +45,8 @@ uint64_t pcb_nsaved; uint64_t pcb_pc; uint64_t pcb_sp; - uint64_t pcb_pad[4]; + vm_paddr_t *pcb_pdir; + uint64_t pcb_pad[3]; } __aligned(64); #ifdef _KERNEL ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#3 (text+ko) ==== @@ -49,8 +49,9 @@ struct intr_request *pc_irhead; \ struct intr_request **pc_irtail; \ struct intr_request *pc_irfree; \ - struct pmap *pc_pmap; \ + struct pmap *pc_curpmap; \ vm_offset_t pc_addr; \ + vm_offset_t pc_tsb; \ vm_offset_t *pc_mondo_data; \ vm_offset_t *pc_cpu_list; \ vm_offset_t *pc_cpu_q; \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#5 (text+ko) ==== @@ -39,28 +39,31 @@ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ +#include #include #include #include #include -#include #define PMAP_CONTEXT_MAX 8192 typedef struct pmap *pmap_t; +struct pv_entry; + struct md_page { - TAILQ_HEAD(, tte) tte_list; - struct pmap *pmap; - uint32_t flags; + int pv_list_count; + TAILQ_HEAD(, pv_entry) pv_list; }; + struct pmap { struct mtx pm_mtx; - struct tte *pm_tsb; + vm_paddr_t *pm_pdir; + TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ vm_object_t pm_tsb_obj; - u_int pm_active; - u_int pm_context[MAXCPU]; + cpumask_t pm_active; + uint16_t pm_context; struct pmap_statistics pm_stats; }; @@ -75,25 +78,34 @@ #define PMAP_TRYLOCK(pmap) mtx_trylock(&(pmap)->pm_mtx) #define PMAP_UNLOCK(pmap) mtx_unlock(&(pmap)->pm_mtx) +/* + * For each vm_page_t, there is a list of all currently valid virtual + * mappings of that page. An entry is a pv_entry_t, the list is pv_table. + */ + +typedef struct pv_entry { + pmap_t pv_pmap; + vm_offset_t pv_va; + TAILQ_ENTRY(pv_entry) pv_list; + TAILQ_ENTRY(pv_entry) pv_plist; +} *pv_entry_t; + +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + void pmap_bootstrap(vm_offset_t ekva); vm_paddr_t pmap_kextract(vm_offset_t va); -void pmap_kenter(vm_offset_t va, vm_page_t m); +void pmap_kenter(vm_offset_t va, vm_paddr_t pa); void pmap_kremove(vm_offset_t); void pmap_kenter_flags(vm_offset_t va, vm_paddr_t pa, u_long flags); void pmap_kremove_flags(vm_offset_t va); -int pmap_cache_enter(vm_page_t m, vm_offset_t va); -void pmap_cache_remove(vm_page_t m, vm_offset_t va); - -int pmap_remove_tte(struct pmap *pm1, struct pmap *pm2, struct tte *tp, - vm_offset_t va); -int pmap_protect_tte(struct pmap *pm1, struct pmap *pm2, struct tte *tp, - vm_offset_t va); - void pmap_set_tsbs(void); void pmap_clear_write(vm_page_t m); +void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); +void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); +void pmap_invalidate_all(pmap_t pmap); #define vtophys(va) pmap_kextract((vm_offset_t)(va)) extern struct pmap kernel_pmap_store; @@ -113,25 +125,4 @@ return (1); } -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.tte_list)) - -#ifdef PMAP_STATS - -SYSCTL_DECL(_debug_pmap_stats); - -#define PMAP_STATS_VAR(name) \ - static long name; \ - SYSCTL_LONG(_debug_pmap_stats, OID_AUTO, name, CTLFLAG_RW, \ - &name, 0, "") - -#define PMAP_STATS_INC(var) \ - atomic_add_long(&var, 1) - -#else - -#define PMAP_STATS_VAR(name) -#define PMAP_STATS_INC(var) - -#endif - #endif /* !_MACHINE_PMAP_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#3 (text+ko) ==== @@ -89,6 +89,23 @@ #define T_KERNEL 64 +#define PTL1_BAD_DEBUG 0 +#define PTL1_BAD_WTRAP 1 +#define PTL1_BAD_KMISS 2 +#define PTL1_BAD_KPROT_FAULT 3 +#define PTL1_BAD_ISM 4 +#define PTL1_BAD_MMUTRAP 5 +#define PTL1_BAD_TRAP 6 +#define PTL1_BAD_FPTRAP 7 +#define PTL1_BAD_INTR_REQ 8 +#define PTL1_BAD_TRACE_PTR 9 +#define PTL1_BAD_STACK 10 +#define PTL1_BAD_DTRACE_FLAGS 11 +#define PTL1_BAD_CTX_STEAL 12 +#define PTL1_BAD_ECC 13 +#define PTL1_BAD_HCALL 14 +#define PTL1_BAD_GL 15 + #ifndef LOCORE extern const char *trap_msg[]; void trap_init(void); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#3 (text+ko) ==== @@ -32,6 +32,8 @@ #ifndef _MACHINE_TSB_H_ #define _MACHINE_TSB_H_ +#define MAX_TSB_INFO 2 + #define TSB_PAGES_SHIFT (4) #define TSB_PAGES (1 << TSB_PAGES_SHIFT) #define TSB_BSHIFT (TSB_PAGES_SHIFT + PAGE_SHIFT) @@ -43,26 +45,43 @@ (TSB_BSHIFT - TSB_BUCKET_SHIFT - TTE_SHIFT) #define TSB_BUCKET_MASK ((1 << TSB_BUCKET_ADDRESS_BITS) - 1) -extern vm_size_t tsb_kernel_mask; -extern vm_size_t tsb_kernel_size; -extern vm_paddr_t tsb_kernel_phys; + +#define TSB_ENTRY_SHIFT 4 /* each entry = 128 bits = 16 bytes */ +#define TSB_ENTRY_SIZE (1 << 4) +#define TSB_START_SIZE 9 +#define TSB_ENTRIES(tsbsz) (1 << (TSB_START_SIZE + tsbsz)) +#define TSB_BYTES(tsbsz) (TSB_ENTRIES(tsbsz) << TSB_ENTRY_SHIFT) +#define TSB_OFFSET_MASK(tsbsz) (TSB_ENTRIES(tsbsz) - 1) + + +/* + * Values for "tsb_ttesz_mask" bitmask. + */ +#define TSB8K (1 << TTE8K) +#define TSB64K (1 << TTE64K) +#define TSB512K (1 << TTE512K) +#define TSB4M (1 << TTE4M) +#define TSB32M (1 << TTE32M) +#define TSB256M (1 << TTE256M) -typedef int (tsb_callback_t)(struct pmap *, struct pmap *, struct tte *, vm_offset_t); +typedef struct tsb_info { + vm_offset_t tsb_va; + vm_paddr_t tsb_pa; /* tsb physical address */ + uint16_t tsb_szc; /* tsb size code */ + uint16_t tsb_flags; + uint32_t tsb_ttesz_mask; /* page size masks */ +} *tsb_info_t; + -void tsb_set_tte(vm_paddr_t tsb_phys, vm_offset_t va, uint64_t tsb_tag, uint64_t tsb_data); -struct tte *tsb_tte_lookup(pmap_t pm, vm_offset_t va); -void tsb_tte_remove(struct tte *stp); -struct tte *tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, - u_long data); +void tsb_set_tte(tsb_info_t tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); -void tsb_tte_local_remove(struct tte *tp); +tte_t tsb_get_tte(tsb_info_t tsb, vm_offset_t va, uint64_t ctx); -void tsb_foreach(pmap_t pm1, pmap_t pm2, vm_offset_t start, vm_offset_t end, - tsb_callback_t *callback); +void tsb_clear_tte(tsb_info_t tsb, vm_offset_t, uint64_t ctx); #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef _MACHINE_TTE_H_ #define _MACHINE_TTE_H_ -#define TTE_SHIFT (5) +#define TTE_SHIFT (4) #define TD_SIZE_SHIFT (61) #define TD_SOFT2_SHIFT (50) @@ -40,30 +40,25 @@ #define TD_PA_SHIFT (13) #define TD_SOFT_SHIFT (7) -#define TD_SIZE_BITS (2) #define TD_SOFT2_BITS (9) #define TD_DIAG_BITS (9) #define TD_PA_BITS (28) #define TD_SOFT_BITS (6) -#define TD_SIZE_MASK ((1UL << TD_SIZE_BITS) - 1) #define TD_SOFT2_MASK ((1UL << TD_SOFT2_BITS) - 1) #define TD_DIAG_MASK ((1UL << TD_DIAG_BITS) - 1) #define TD_PA_MASK ((1UL << TD_PA_BITS) - 1) #define TD_SOFT_MASK ((1UL << TD_SOFT_BITS) - 1) -#define TS_8K (0UL) -#define TS_64K (1UL) -#define TS_512K (2UL) -#define TS_4M (3UL) -#define TS_32M (4UL) -#define TS_256M (5UL) -#define TS_2G (6UL) -#define TS_16G (7UL) +#define TTE8K (0UL) +#define TTE64K (1UL) +#define TTE512K (2UL) +#define TTE4M (3UL) +#define TTE32M (4UL) +#define TTE256M (5UL) +#define TTE2G (6UL) +#define TTE16G (7UL) -#define TS_MIN TS_8K -#define TS_MAX TS_4M - #define TD_V (1UL << 63) #define TD_8K (TS_8K << TD_SIZE_SHIFT) #define TD_64K (TS_64K << TD_SIZE_SHIFT) @@ -87,8 +82,6 @@ #define TD_W (1UL << 1) #define TD_G (1UL << 0) -#define TV_SIZE_BITS (TD_SIZE_BITS) -#define TV_VPN(va, sz) ((((va) >> TTE_PAGE_SHIFT(sz)) << TV_SIZE_BITS) | sz) #define TTE_SIZE_SPREAD (3) #define TTE_PAGE_SHIFT(sz) \ @@ -117,19 +110,8 @@ memset(tp, 0, sizeof(*tp)) struct pmap; - -typedef struct tte { - u_long tte_vpn; - u_long tte_data; - TAILQ_ENTRY(tte) tte_link; -} *tte_t; - -static __inline int -tte_match(struct tte *tp, vm_offset_t va) -{ - return (((tp->tte_data & TD_V) != 0) && - (tp->tte_vpn == TV_VPN(va, TTE_GET_SIZE(tp)))); -} +#define PTE_SHIFT (3) +#define PT_SHIFT (PAGE_SHIFT - PTE_SHIFT) #define VTD_SOFT_SHIFT (56) @@ -144,16 +126,112 @@ #define VTD_X (1UL << 7) #define VTD_W (1UL << 6) -#define VTD_REF ((1UL << 3) << VTD_SOFT_SHIFT) -#define VTD_SW ((1UL << 1) << VTD_SOFT_SHIFT) +#define VTD_REF ((1UL << 3) << VTD_SOFT_SHIFT) /* XXX WRONG */ +#define VTD_SW ((1UL << 1) << VTD_SOFT_SHIFT) /* XXX WRONG */ +#define VTD_WIRED ((1UL << 0) << VTD_SOFT_SHIFT) + + + +#define VTD_8K TTE8K +#define VTD_64K TTE64K +#define VTD_512K TTE512K +#define VTD_4M TTE4M +#define VTD_32M TTE32M +#define VTD_256M TTE256M + +/* + * default flags for kernel pages + */ +#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W + + +typedef union { + struct tte { + unsigned int v:1; /* <63> valid */ + unsigned int nfo:1; /* <62> non-fault only */ + unsigned int sw:4; /* <61:58> sw */ + unsigned int wired:1; /* <57> wired */ + unsigned int lock:1; /* <56> sw - locked */ + unsigned long pa:43; /* <55:13> pa */ + unsigned int ie:1; /* <12> 1=invert endianness */ + unsigned int e:1; /* <11> side effect */ + unsigned int cp:1; /* <10> physically cache */ + unsigned int cv:1; /* <9> virtually cache */ + unsigned int p:1; /* <8> privilege required */ + unsigned int x:1; /* <7> execute perm */ + unsigned int w:1; /* <6> write perm */ + unsigned int ref:1; /* <5> sw - ref */ + unsigned int wr_perm:1; /* <4> sw - write perm */ + unsigned int rsvd:1; /* <3> reserved */ + unsigned int sz:3; /* <2:0> pagesize */ + } tte_bit; + uint64_t ll; +} tte_t; + +#define tte_val tte_bit.v /* use < 0 check in asm */ +#define tte_size tte_bit.sz +#define tte_nfo tte_bit.nfo +#define tte_ie tte_bit.ie +#define tte_wired tte_bit.wired +#define tte_pa tte_bit.pa +#define tte_ref tte_bit.ref +#define tte_wr_perm tte_bit.wr_perm +#define tte_exec_perm tte_bit.x +#define tte_lock tte_bit.lock +#define tte_cp tte_bit.cp +#define tte_cv tte_bit.cv +#define tte_se tte_bit.e +#define tte_priv tte_bit.p +#define tte_hwwr tte_bit.w + +#define TTE_IS_VALID(ttep) ((ttep)->tte_inthi < 0) +#define TTE_SET_INVALID(ttep) ((ttep)->tte_val = 0) +#define TTE_IS_8K(ttep) (TTE_CSZ(ttep) == TTE8K) +#define TTE_IS_WIRED(ttep) ((ttep)->tte_wired) +#define TTE_IS_WRITABLE(ttep) ((ttep)->tte_wr_perm) +#define TTE_IS_EXECUTABLE(ttep) ((ttep)->tte_exec_perm) +#define TTE_IS_PRIVILEGED(ttep) ((ttep)->tte_priv) +#define TTE_IS_NOSYNC(ttep) ((ttep)->tte_no_sync) +#define TTE_IS_LOCKED(ttep) ((ttep)->tte_lock) +#define TTE_IS_SIDEFFECT(ttep) ((ttep)->tte_se) +#define TTE_IS_NFO(ttep) ((ttep)->tte_nfo) + +#define TTE_IS_REF(ttep) ((ttep)->tte_ref) +#define TTE_IS_MOD(ttep) ((ttep)->tte_hwwr) +#define TTE_IS_IE(ttep) ((ttep)->tte_ie) +#define TTE_SET_SUSPEND(ttep) ((ttep)->tte_suspend = 1) +#define TTE_CLR_SUSPEND(ttep) ((ttep)->tte_suspend = 0) +#define TTE_IS_SUSPEND(ttep) ((ttep)->tte_suspend) +#define TTE_SET_REF(ttep) ((ttep)->tte_ref = 1) +#define TTE_CLR_REF(ttep) ((ttep)->tte_ref = 0) +#define TTE_SET_LOCKED(ttep) ((ttep)->tte_lock = 1) +#define TTE_CLR_LOCKED(ttep) ((ttep)->tte_lock = 0) +#define TTE_SET_MOD(ttep) ((ttep)->tte_hwwr = 1) +#define TTE_CLR_MOD(ttep) ((ttep)->tte_hwwr = 0) +#define TTE_SET_RM(ttep) \ + (((ttep)->tte_intlo) = \ + (ttep)->tte_intlo | TTE_HWWR_INT | TTE_REF_INT) +#define TTE_CLR_RM(ttep) \ + (((ttep)->tte_intlo) = \ + (ttep)->tte_intlo & ~(TTE_HWWR_INT | TTE_REF_INT)) + +#define TTE_SET_WRT(ttep) ((ttep)->tte_wr_perm = 1) +#define TTE_CLR_WRT(ttep) ((ttep)->tte_wr_perm = 0) +#define TTE_SET_EXEC(ttep) ((ttep)->tte_exec_perm = 1) +#define TTE_CLR_EXEC(ttep) ((ttep)->tte_exec_perm = 0) +#define TTE_SET_PRIV(ttep) ((ttep)->tte_priv = 1) +#define TTE_CLR_PRIV(ttep) ((ttep)->tte_priv = 0) + +#define TTE_BSZS_SHIFT(sz) ((sz) * 3) +struct pmap; -#define VTD_8K TS_8K -#define VTD_64K TS_64K -#define VTD_512K TS_512K -#define VTD_4M TS_4M -#define VTD_32M TS_32M -#define VTD_256M TS_256M +void tte_clear_phys_bit(vm_page_t m, uint64_t flags); +void tte_set_phys_bit(vm_page_t m, uint64_t flags); +boolean_t tte_get_phys_bit(vm_page_t m, uint64_t flags); +void tte_clear_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); +void tte_set_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); +boolean_t tte_get_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); #endif /* !_MACHINE_TTE_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/wstate.h#2 (text+ko) ==== @@ -1,91 +1,32 @@ -/*- - * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Berkeley Software Design Inc's name may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: BSDI: wstate.h,v 1.4 1997/09/18 13:05:51 torek Exp - * $FreeBSD: src/sys/sparc64/include/wstate.h,v 1.4 2002/02/25 18:37:17 jake Exp $ - */ #ifndef _MACHINE_WSTATE_H_ #define _MACHINE_WSTATE_H_ /* - * Window state register bits. + * Window State Register (WSTATE) * - * There really are no bits per se, just the two fields WSTATE.NORMAL - * and WSTATE.OTHER. The rest is up to software. - * - * We use WSTATE_NORMAL to represent user mode or kernel mode saves - * (whichever is currently in effect) and WSTATE_OTHER to represent - * user mode saves (only). - * - * We use the low bit to suggest 32-bit mode, with the next bit set - * once we succeed in saving in some mode. That is, if the WSTATE_ASSUME - * bit is set, the spill or fill handler we use will be one that makes - * an assumption about the proper window-save mode. If the spill or - * fill fails with an alignment fault, the spill or fill op should - * take the `assume' bit away retry the instruction that caused the - * spill or fill. This will use the new %wstate, which will test for - * which mode to use. The alignment fault code helps us out here by - * resuming the spill vector at offset +70, where we are allowed to - * execute two instructions (i.e., write to %wstate and RETRY). - * - * If the ASSUME bit is not set when the alignment fault occurs, the - * given stack pointer is hopelessly wrong (and the spill, if it is a - * spill, should be done as a sort of "panic spill") -- so those two - * instructions will be a branch sequence. - * - * Note that locore.s assumes this same bit layout (since the translation - * from "bits" to "{spill,fill}_N_{normal,other}" is done in hardware). - * - * The value 0 is preferred for unknown to make it easy to start in - * unknown state and continue in whichever state unknown succeeds in -- - * a successful "other" save, for instance, can just set %wstate to - * ASSUMExx << USERSHIFT and thus leave the kernel state "unknown". - * - * We also need values for managing the somewhat tricky transition from - * user to kernel and back, so we use the one remaining free bit to mean - * "although this looks like kernel mode, the window(s) involved are - * user windows and should be saved ASI_AIUP". Everything else is - * otherwise the same, but we need not bother with assumptions in this - * mode (we expect it to apply to at most one window spill or fill), - * i.e., WSTATE_TRANSITION can ignore WSTATE_ASSUME if it likes. + * |------------| + * |OTHER|NORMAL| + * |-----|------| + * 5 3 2 0 */ -#define WSTATE_NORMAL_MASK 1 /* wstate normal minus transition */ -#define WSTATE_OTHER_SHIFT 3 /* for wstate other / user */ -#define WSTATE_OTHER_MASK /* wstate other minus nested */ \ - (WSTATE_NORMAL_MASK << WSTATE_OTHER_SHIFT) +#define WSTATE_BAD 0 /* unused */ +#define WSTATE_U32 1 /* 32b stack */ +#define WSTATE_U64 2 /* 64b stack */ +#define WSTATE_CLEAN32 3 /* cleanwin workaround, 32b stack */ +#define WSTATE_CLEAN64 4 /* cleanwin workaround, 64b stack */ +#define WSTATE_K32 5 /* priv 32b stack */ +#define WSTATE_K64 6 /* priv 64b stack */ +#define WSTATE_KMIX 7 /* priv mixed stack */ -#define WSTATE_KERNEL 0 /* normal kernel wstate */ -#define WSTATE_USER_64 0 /* normal 64bit user wstate */ -#define WSTATE_USER_32 1 /* normal 32bit user wstate */ +#define WSTATE_CLEAN_OFFSET 2 +#define WSTATE_SHIFT 3 /* normal-to-other shift */ +#define WSTATE_MASK 7 /* mask for each set */ +#define WSTATE(o, n) (((o) << WSTATE_SHIFT) | (n)) -#define WSTATE_TRANSITION 2 /* if set, force user window */ -#define WSTATE_NESTED /* if set, spill must not fault */ \ - (WSTATE_TRANSITION << WSTATE_OTHER_SHIFT) +#define WSTATE_USER32 WSTATE(WSTATE_BAD, WSTATE_U32) +#define WSTATE_USER64 WSTATE(WSTATE_BAD, WSTATE_U64) +#define WSTATE_KERN WSTATE(WSTATE_U32, WSTATE_K64) #endif /* !_MACHINE_WSTATE_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#9 (text+ko) ==== @@ -69,6 +69,8 @@ #include "assym.s" +#include + #define TSB_KERNEL_MASK 0x0 #define TSB_KERNEL 0x0 @@ -98,7 +100,8 @@ mov SCRATCH_REG_PCB, %g0 ; \ ldxa [%g0]ASI_SCRATCHPAD, PCB_REG - + + /* * Macros for spilling and filling live windows. * Here we use the more complicated [regaddr] format which requires @@ -204,7 +207,7 @@ ldx [ASP_REG + 8], %g2 ; \ ldx [ASP_REG + 0], %g1 ; \ inc 16, ASP_REG - +#if 0 ENTRY(tl1_kstack_fault) rdpr %tl, %g1 1: cmp %g1, 2 @@ -261,7 +264,8 @@ ba %xcc, tl1_trap mov T_KSTACK_FAULT | T_KERNEL, %o0 END(tl1_kstack_fault) - +#endif + /* * Magic to resume from a spill or fill trap. If we get an alignment or an * mmu fault during a spill or a fill, this macro will detect the fault and @@ -356,9 +360,9 @@ stx %g2, [%g1 + KTR_PARM2] 9: #endif - +#if 0 KSTACK_CHECK - +#endif sir END(rsf_fatal) @@ -425,9 +429,11 @@ */ .macro tl0_split +#if 0 rdpr %wstate, %g1 wrpr %g1, WSTATE_TRANSITION, %wstate save +#endif .endm .macro tl0_setup type @@ -455,13 +461,13 @@ tl0_gen T_RESERVED .endr .endm - +#if 0 .macro tl1_split rdpr %wstate, %g1 wrpr %g1, WSTATE_NESTED, %wstate save %sp, -(CCFSZ + TF_SIZEOF), %sp .endm - +#endif .macro tl1_setup type tl1_split clr %o1 @@ -477,7 +483,9 @@ .macro tl1_reserved count .rept \count +#if 0 tl1_gen T_RESERVED +#endif .endr .endm @@ -504,7 +512,7 @@ .macro tl0_align .align 32 .endm - + .macro cpu_mondo .align 32 .endm @@ -522,6 +530,7 @@ .endm +#define ALIGN_128 .align 128 #define spill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ @@ -530,7 +539,7 @@ retry ; \ .skip (31-26)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ - .align 128 + ALIGN_128 #define spill_64bit_asi(asi, target) \ SPILL(stxa, SPOFF, 8, asi) ; \ @@ -538,7 +547,7 @@ retry ; \ .skip (31-25)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ - .align 128 + ALIGN_128 #define spill_32clean(asi, target) \ srl %sp, 0, %sp ; \ @@ -547,7 +556,7 @@ mov WSTATE_USER32, %g7 ; \ .skip (31-26)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ - .align 128 + ALIGN_128 #define spill_64clean(asi, target) \ SPILL(stxa, SPOFF, 8, asi) ; \ @@ -555,7 +564,7 @@ mov WSTATE_USER64, %g7 ; \ .skip (31-25)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ - .align 128 + ALIGN_128 #define fill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ @@ -564,7 +573,7 @@ retry ; \ .skip (31-26)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ - .align 128 + ALIGN_128 #define fill_64bit_asi(asi, target) \ FILL(ldxa, SPOFF, 8, asi) ; \ @@ -572,7 +581,7 @@ retry ; \ .skip (31-25)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ - .align 128 + .macro spill_32bit_primary_sn0 spill_32bit_asi(ASI_AIUP, sn0) @@ -669,8 +678,11 @@ .macro fill_mixed .align 128 .endm + + .macro tl1_align + .align 32 + .endm - ENTRY(tl0_sfsr_trap) tl0_split clr %o1 @@ -1204,7 +1216,7 @@ .macro tl1_insn_excptn .align 32 .endm - +#if 0 ENTRY(tl1_insn_exceptn_trap) tl1_split clr %o1 @@ -1267,7 +1279,7 @@ ENTRY(tl1_sfsr_trap) END(tl1_sfsr_trap) - +#endif .macro tl1_intr level, mask tl1_split set \mask, %o1 @@ -1786,7 +1798,7 @@ tl1_divide: tl1_reserved 8 ! 0x228-0x22f tl1_data_excptn: - tl1_data_excptn ! 0x230 + data_excptn ! 0x230 data_miss ! 0x231 tl1_reserved 2 ! 0x232-0x233 tl1_align: @@ -1924,7 +1936,9 @@ * Setup %wstate for return, clear WSTATE_TRANSITION. */ rdpr %wstate, %l1 + #if 0 and %l1, WSTATE_NORMAL_MASK, %l1 + #endif wrpr %l1, 0, %wstate /* @@ -1990,9 +2004,11 @@ 9: #endif +#if 0 1: and %l5, WSTATE_NORMAL_MASK, %l5 sllx %l5, WSTATE_OTHER_SHIFT, %l5 wrpr %l5, WSTATE_KERNEL, %wstate +#endif rdpr %canrestore, %l6 wrpr %l6, 0, %otherwin wrpr %g0, 0, %canrestore @@ -2080,9 +2096,11 @@ wrpr %o0, 0, %pil wr %o1, 0, %clear_softint +#if 0 and %l5, WSTATE_NORMAL_MASK, %l5 sllx %l5, WSTATE_OTHER_SHIFT, %l5 wrpr %l5, WSTATE_KERNEL, %wstate +#endif rdpr %canrestore, %l6 wrpr %l6, 0, %otherwin wrpr %g0, 0, %canrestore @@ -2320,9 +2338,10 @@ * set the transition bit so the restore will be handled specially * if it traps, use the xor feature of wrpr to do that. */ +#if 0 srlx %l6, WSTATE_OTHER_SHIFT, %g3 wrpr %g3, WSTATE_TRANSITION, %wstate - +#endif /* * Setup window management registers for return. If not all user * windows were spilled in the kernel %otherwin will be non-zero, @@ -2473,10 +2492,10 @@ #endif wrpr %g0, 1, %tl - +#if 0 and %l5, WSTATE_OTHER_MASK, %l5 wrpr %l5, WSTATE_KERNEL, %wstate - +#endif stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] stx %o1, [%sp + SPOFF + CCFSZ + TF_LEVEL] stx %o3, [%sp + SPOFF + CCFSZ + TF_TAR] @@ -2616,10 +2635,10 @@ wr %o1, 0, %clear_softint wrpr %g0, 1, %tl - +#if 0 and %l5, WSTATE_OTHER_MASK, %l5 wrpr %l5, WSTATE_KERNEL, %wstate - +#endif stx %l0, [%sp + SPOFF + CCFSZ + TF_TSTATE] stx %l1, [%sp + SPOFF + CCFSZ + TF_TPC] stx %l2, [%sp + SPOFF + CCFSZ + TF_TNPC] ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#3 (text+ko) ==== @@ -585,7 +585,7 @@ */ ENTRY(hvio_intr_getvalid) mov %o1, %o2 - mov HVIO_INTR_GETVALID, %o5 + mov HVIO_INTR_GETENABLED, %o5 ta FAST_TRAP brz,a %o0, 1f stuw %o1, [%o2] @@ -600,7 +600,7 @@ * ret0 - status */ ENTRY(hvio_intr_setvalid) - mov HVIO_INTR_SETVALID, %o5 + mov HVIO_INTR_SETENABLED, %o5 ta FAST_TRAP retl nop @@ -1366,4 +1366,24 @@ nop SET_SIZE(hv_hpriv) + /* + * panic_bad_hcall is called when a hcall returns + * unexpected error + * %o0 error number + * %o1 hcall number + */ + + .text +bad_hcall_error: + .asciz "hypervisor call 0x%x returned an unexpected error %d" + + ENTRY(panic_bad_hcall) + mov %o0, %o2 + sethi %hi(bad_hcall_error), %o0 + or %o0, %lo(bad_hcall_error), %o0 + mov %o7, %o3 + call panic + mov %o3, %o7 + SET_SIZE(panic_bad_hcall) + #endif /* lint || __lint */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#7 (text+ko) ==== @@ -347,15 +347,7 @@ mp_tramp = mp_tramp_alloc(); #endif - /* - * Initialize virtual memory and calculate physmem. - */ - pmap_bootstrap(end); - /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 21 07:39:54 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 D41B516A426; Tue, 21 Feb 2006 07:39:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A359E16A423 for ; Tue, 21 Feb 2006 07:39:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4E1943D55 for ; Tue, 21 Feb 2006 07:39:52 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1L7dq0L098151 for ; Tue, 21 Feb 2006 07:39:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L7dqh1098148 for perforce@freebsd.org; Tue, 21 Feb 2006 07:39:52 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Feb 2006 07:39:52 GMT Message-Id: <200602210739.k1L7dqh1098148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92118 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, 21 Feb 2006 07:39:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92118 Change 92118 by kmacy@kmacy_storage:sun4v_work on 2006/02/21 07:39:00 fix pmap_activate Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#9 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -203,9 +204,7 @@ void pmap_activate(struct thread *td) { -#ifdef notyet struct proc *p = td->td_proc; -#endif pmap_t pmap, oldpmap; critical_enter(); @@ -219,22 +218,18 @@ pmap->pm_active |= 1; #endif -#ifdef notyet + /* XXX complains of incomplete type in spite of being defined */ if (p->p_flag & P_SA) { /* Make sure all other cr3 entries are updated. */ /* what if they are running? XXXKSE (maybe abort them) */ FOREACH_THREAD_IN_PROC(p, td) { - td-> - td_pcb-> - pcb_pdir = - pmap-> - pm_pdir; + td->td_pcb->pcb_pdir = pmap->pm_pdir; } } else { td->td_pcb->pcb_pdir = pmap->pm_pdir; } -#endif + set_pdir_scratchpad(pmap->pm_pdir); PCPU_SET(curpmap, pmap); critical_exit(); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 15:13:21 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 AC81416A423; Tue, 21 Feb 2006 15:13:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D74916A420 for ; Tue, 21 Feb 2006 15:13:20 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC1543D6A for ; Tue, 21 Feb 2006 15:13:18 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LFDITb037117 for ; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LFDI3G037114 for perforce@freebsd.org; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 15:13:18 GMT Message-Id: <200602211513.k1LFDI3G037114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92125 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, 21 Feb 2006 15:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92125 Change 92125 by csjp@csjp_xor on 2006/02/21 15:12:46 Minimize namespace pollution by moving the #includes under the #if USE_BSM_AUDIT Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#13 (text+ko) ==== @@ -31,6 +31,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ */ +#ifdef USE_BSM_AUDIT #include __FBSDID("$FreeBSD$"); @@ -47,7 +48,6 @@ #include "login.h" -#ifdef USE_BSM_AUDIT /* * Audit data */ From owner-p4-projects@FreeBSD.ORG Tue Feb 21 15:13: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 3971C16A423; Tue, 21 Feb 2006 15:13:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D232116A420 for ; Tue, 21 Feb 2006 15:13:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EBCB43D46 for ; Tue, 21 Feb 2006 15:13:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LFDf9m037220 for ; Tue, 21 Feb 2006 15:13:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LFDI0p037120 for perforce@freebsd.org; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 21 Feb 2006 15:13:18 GMT Message-Id: <200602211513.k1LFDI0p037120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92126 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, 21 Feb 2006 15:13:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92126 Change 92126 by rwatson@rwatson_zoo on 2006/02/21 15:12:55 Integrate TrustedBSD base branch from FreeBSD CVS: - snmp updates - OpenBSM update to 1.0a4. - NO_AUDIT - atheros driver, 802.11 updates - Normal plethora of driver tweaks, meta-data additions, bug fixes, etc. - Accounting fixup. - Audit arguments to signal, process system calls. - Page size jumbo mbuf clusters. - Various audit bug fixes. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#68 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/base/UPDATING#62 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#12 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#6 integrate .. //depot/projects/trustedbsd/base/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/base/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/base/bin/ln/ln.1#10 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#12 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#47 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#51 integrate .. //depot/projects/trustedbsd/base/etc/hosts.allow#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/trustedbsd/base/etc/rc#29 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#35 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/SERVERS#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localpkg#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pccard#7 delete .. //depot/projects/trustedbsd/base/etc/rc.d/root#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#24 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#48 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/trustedbsd/base/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#17 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/libutil.h#8 integrate .. //depot/projects/trustedbsd/base/release/Makefile#72 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#97 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#36 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#43 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#35 integrate .. //depot/projects/trustedbsd/base/sbin/mca/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#20 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#14 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#18 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#40 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#63 integrate .. //depot/projects/trustedbsd/base/share/man/man4/agp.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ataraid.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/atkbd.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_one2many.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ohci.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/syscons.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twa.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vga.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/man/man5/group.5#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#38 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#55 integrate .. //depot/projects/trustedbsd/base/share/man/man9/acl.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/buf.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/memguard.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mtx_pool.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/base/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/base/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#42 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#96 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#59 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#46 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#40 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#56 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#46 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#60 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#58 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#53 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#72 integrate .. //depot/projects/trustedbsd/base/sys/modules/arcnet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/dummynet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/firewire/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/nfs4client/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/nfsclient/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/twa/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ksocket.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#59 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#22 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#32 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_intel.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_pcn.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#45 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#46 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#34 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#43 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/db_trace.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/eeprom.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#21 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#48 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#52 integrate .. //depot/projects/trustedbsd/base/sys/sys/pcpu.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#72 integrate .. //depot/projects/trustedbsd/base/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#37 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#42 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#40 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/base/usr.bin/column/column.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mbuf.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.8#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/wall/wall.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/who/who.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#47 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/sdp.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcsecd/hcsecd.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/moused/moused.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/powerd/powerd.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#68 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/base/UPDATING#62 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/csh/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/base/bin/csh/config.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/base/bin/ln/ln.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/base/bin/ln/ln.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/base/bin/ps/print.c#19 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#4 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#10 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 21 15:31: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 10F0216A423; Tue, 21 Feb 2006 15:31:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4BC316A420 for ; Tue, 21 Feb 2006 15:31:57 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C62443D48 for ; Tue, 21 Feb 2006 15:31:57 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LFVv93042241 for ; Tue, 21 Feb 2006 15:31:57 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LFVvme042238 for perforce@freebsd.org; Tue, 21 Feb 2006 15:31:57 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 15:31:57 GMT Message-Id: <200602211531.k1LFVvme042238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92128 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, 21 Feb 2006 15:31:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92128 Change 92128 by csjp@csjp_xor on 2006/02/21 15:31:43 Do not ignore the return value of au_write. This function can fail so we should make sure it doesn't, but if it does, do the right thing. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#14 (text+ko) ==== @@ -110,13 +110,21 @@ syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(0, 0)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); @@ -176,21 +184,33 @@ errx(1, "Permission denied"); } } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } /* Include the error message. */ if ((tok = au_to_text(errmsg)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(1, errno)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "login: Audit Error: au_to_return32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, @@ -240,14 +260,22 @@ "login: Audit Error: au_to_subject32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(0, 0)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "login: Audit Error: au_to_return32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_logout) == -1) { syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 18:16: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 0CDFA16A423; Tue, 21 Feb 2006 18:16:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5A2916A420 for ; Tue, 21 Feb 2006 18:16:30 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4713D43D49 for ; Tue, 21 Feb 2006 18:16:30 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LIGUCA056423 for ; Tue, 21 Feb 2006 18:16:30 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LIGT30056420 for perforce@freebsd.org; Tue, 21 Feb 2006 18:16:29 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 18:16:29 GMT Message-Id: <200602211816.k1LIGT30056420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92132 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, 21 Feb 2006 18:16:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92132 Change 92132 by csjp@csjp_xor on 2006/02/21 18:15:32 Keep audit error syslog messages using a consistent format, prefix all error messages with "audit", remove redundant data which will show up in the syslog messages. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#15 (text+ko) ==== @@ -74,7 +74,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "Could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -84,7 +84,7 @@ /* Compute and set the user's preselection mask. */ if (au_user_mask(pwd->pw_name, &aumask) == -1) { syslog(LOG_AUTH | LOG_ERR, - "Could not set audit mask: %s", strerror(errno)); + "audit: could not set audit mask: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -94,40 +94,41 @@ bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); if (setaudit(&auinfo) != 0) { - syslog(LOG_AUTH | LOG_ERR, "setaudit failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: setaudit failed: %s", strerror(errno)); errx(1, "Permission denied"); } if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); errx(1,"Permission denied"); } if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(0, 0)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_return32 failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_login) == -1) { - syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: audit record not committed"); errx(1, "Permission denied"); } } @@ -151,7 +152,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -159,7 +160,7 @@ return; if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -171,7 +172,8 @@ */ if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, pid, -1, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } } else { @@ -180,41 +182,42 @@ gid = pwd->pw_gid; if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } /* Include the error message. */ if ((tok = au_to_text(errmsg)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_text failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(1, errno)) == NULL) { syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_return32() failed"); + "audit: au_to_return32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_close() was not committed"); + "audit: au_close() was not committed"); errx(1, "Permission denied"); } } @@ -240,7 +243,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "login: Could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -248,37 +251,34 @@ return; if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_open() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_open() failed"); errx(1, "Permission denied"); } /* The subject that is created (euid, egid of the current process). */ if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_subject32() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_subject32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(0, 0)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_return32() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_return32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_logout) == -1) { - syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); + syslog(LOG_AUTH | LOG_ERR, "audit: record was not committed."); errx(1, "Permission denied"); } } From owner-p4-projects@FreeBSD.ORG Tue Feb 21 18:53:17 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 8DFB016A423; Tue, 21 Feb 2006 18:53:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5036716A420 for ; Tue, 21 Feb 2006 18:53:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2E6343D45 for ; Tue, 21 Feb 2006 18:53:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LIrFrG058827 for ; Tue, 21 Feb 2006 18:53:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LIrFn5058824 for perforce@freebsd.org; Tue, 21 Feb 2006 18:53:15 GMT (envelope-from imp@freebsd.org) Date: Tue, 21 Feb 2006 18:53:15 GMT Message-Id: <200602211853.k1LIrFn5058824@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 92135 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, 21 Feb 2006 18:53:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92135 Change 92135 by imp@imp_Speedy on 2006/02/21 18:52:40 Check for failure with the right variable. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#2 (text+ko) ==== @@ -163,7 +163,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: From owner-p4-projects@FreeBSD.ORG Tue Feb 21 19:03: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 02C9816A423; Tue, 21 Feb 2006 19:03:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2E4D16A420 for ; Tue, 21 Feb 2006 19:03:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C157E43D6A for ; Tue, 21 Feb 2006 19:03:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LJ3StV059304 for ; Tue, 21 Feb 2006 19:03:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LJ3Sea059301 for perforce@freebsd.org; Tue, 21 Feb 2006 19:03:28 GMT (envelope-from imp@freebsd.org) Date: Tue, 21 Feb 2006 19:03:28 GMT Message-Id: <200602211903.k1LJ3Sea059301@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 92136 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, 21 Feb 2006 19:03:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92136 Change 92136 by imp@imp_Speedy on 2006/02/21 19:02:58 Shareable interrupts Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#3 (text+ko) ==== @@ -162,7 +162,7 @@ goto errout; rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->irq_res == NULL) goto errout; return (0); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 19:04: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 69BF516A425; Tue, 21 Feb 2006 19:04:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4327716A420 for ; Tue, 21 Feb 2006 19:04:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F203B43D94 for ; Tue, 21 Feb 2006 19:04:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LJ4UnN059335 for ; Tue, 21 Feb 2006 19:04:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LJ4UHR059332 for perforce@freebsd.org; Tue, 21 Feb 2006 19:04:30 GMT (envelope-from imp@freebsd.org) Date: Tue, 21 Feb 2006 19:04:30 GMT Message-Id: <200602211904.k1LJ4UHR059332@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 92138 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, 21 Feb 2006 19:04:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92138 Change 92138 by imp@imp_Speedy on 2006/02/21 19:04:11 fix ohci address, mostly. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#8 (text+ko) ==== @@ -216,6 +216,7 @@ bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size); } +#define NORMDEV 50 static int at91_attach(device_t dev) @@ -234,19 +235,20 @@ sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; +#if 0 sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs"; +#endif if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, - 0xfffffffful) != 0) + 0xfffffffful) != 0) panic("at91_attach: failed to set up memory rman"); - if (rman_init(&sc->sc_usbmem_rman) != 0 || - rman_manage_region(&sc->sc_usbmem_rman, 0x00300000, - 0x003fffff) != 0) - panic("at91_attach: failed to set up USB memory rman"); + if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, + AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) + panic("at91_attach: failed to set up ohci memory"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + @@ -286,45 +288,46 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xa44, 0xffffffff); /* Disable all interrupts for the SDRAM controller */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff); - at91_add_child(dev, 0, "at91_st", 0, 0, 0, 1); - at91_add_child(dev, 0, "at91_pio", 0, AT91RM92_BASE + // PMC + i = 0; + at91_add_child(dev, i++, "at91_st", 0, 0, 0, AT91RM92_IRQ_SYSTEM); + at91_add_child(dev, i++, "at91_pio", 0, AT91RM92_BASE + // PIOA AT91RM92_PIOA_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, 0, "at91_pio", 1, AT91RM92_BASE + // PMC + at91_add_child(dev, i++, "at91_pio", 1, AT91RM92_BASE + // PIOB AT91RM92_PIOB_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, 0, "at91_pio", 2, AT91RM92_BASE + // PMC + at91_add_child(dev, i++, "at91_pio", 2, AT91RM92_BASE + // PIOC AT91RM92_PIOC_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, 0, "at91_pio", 3, AT91RM92_BASE + // PMC + at91_add_child(dev, i++, "at91_pio", 3, AT91RM92_BASE + // PIOD AT91RM92_PIOD_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, 3, "at91_pmc", 0, AT91RM92_BASE + // PMC + at91_add_child(dev, i++, "at91_pmc", 0, AT91RM92_BASE + // PMC AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, 10, "at91_udp", 0, AT91RM92_BASE + // UDP + at91_add_child(dev, NORMDEV, "at91_udp", 0, AT91RM92_BASE + // UDP AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); - at91_add_child(dev, 10, "at91_mci", 0, AT91RM92_BASE + // MCI + at91_add_child(dev, NORMDEV, "at91_mci", 0, AT91RM92_BASE + // MCI AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); - at91_add_child(dev, 10, "at91_twi", 0, AT91RM92_BASE + // TWI + at91_add_child(dev, NORMDEV, "at91_twi", 0, AT91RM92_BASE + // TWI AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); - at91_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC + at91_add_child(dev, NORMDEV, "ate", 0, AT91RM92_BASE + // EMAC AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); - at91_add_child(dev, 10, "uart", 0, AT91RM92_BASE + // DBGU + at91_add_child(dev, NORMDEV, "uart", 0, AT91RM92_BASE + // DBGU AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, AT91RM92_IRQ_SYSTEM); - at91_add_child(dev, 10, "uart", 1, AT91RM92_BASE + // USART0 + at91_add_child(dev, NORMDEV, "uart", 1, AT91RM92_BASE + // USART0 AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART0); - at91_add_child(dev, 10, "uart", 2, AT91RM92_BASE + // USART1 + at91_add_child(dev, NORMDEV, "uart", 2, AT91RM92_BASE + // USART1 AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART1); - at91_add_child(dev, 10, "uart", 3, AT91RM92_BASE + // USART2 + at91_add_child(dev, NORMDEV, "uart", 3, AT91RM92_BASE + // USART2 AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); - at91_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 + at91_add_child(dev, NORMDEV, "uart", 4, AT91RM92_BASE + // USART3 AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); - at91_add_child(dev, 10, "at91_ssc", 0, AT91RM92_BASE + // SSC0 + at91_add_child(dev, NORMDEV, "at91_ssc", 0, AT91RM92_BASE + // SSC0 AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); - at91_add_child(dev, 10, "at91_ssc", 1, AT91RM92_BASE + // SSC1 + at91_add_child(dev, NORMDEV, "at91_ssc", 1, AT91RM92_BASE + // SSC1 AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); - at91_add_child(dev, 10, "at91_ssc", 2, AT91RM92_BASE + // SSC2 + at91_add_child(dev, NORMDEV, "at91_ssc", 2, AT91RM92_BASE + // SSC2 AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); - at91_add_child(dev, 10, "at91_spi", 0, AT91RM92_BASE + // SPI + at91_add_child(dev, NORMDEV, "at91_spi", 0, AT91RM92_BASE + // SPI AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); // Not sure that the following belongs on this bus. - at91_add_child(dev, 10, "ohci", 0, // UHP + at91_add_child(dev, NORMDEV, "ohci", 0, // UHP AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP); bus_generic_probe(dev); bus_generic_attach(dev); @@ -362,10 +365,12 @@ start, end, count, flags, child); break; case SYS_RES_MEMORY: +#if 0 if (start >= 0x00300000 && start <= 0x003fffff) rle->res = rman_reserve_resource(&sc->sc_usbmem_rman, start, end, count, flags, child); else +#endif rle->res = rman_reserve_resource(&sc->sc_mem_rman, start, end, count, flags, child); rman_set_bustag(rle->res, &at91_bs_tag); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 19:04:39 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 8436E16A423; Tue, 21 Feb 2006 19:04:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5ED4D16A420 for ; Tue, 21 Feb 2006 19:04:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA50F43D90 for ; Tue, 21 Feb 2006 19:04:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LJ4Uhw059329 for ; Tue, 21 Feb 2006 19:04:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LJ4Uga059326 for perforce@freebsd.org; Tue, 21 Feb 2006 19:04:30 GMT (envelope-from imp@freebsd.org) Date: Tue, 21 Feb 2006 19:04:30 GMT Message-Id: <200602211904.k1LJ4Uga059326@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 92137 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, 21 Feb 2006 19:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92137 Change 92137 by imp@imp_Speedy on 2006/02/21 19:03:49 Initialize more of the clocks. We now hang when reading the ohci version number. More to follow. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#8 (text+ko) ==== @@ -250,7 +250,9 @@ int freq; sc->main_clock_hz = main_clock; - + main_ck.hz = main_clock; + plla.hz = at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0); + /* * Initialize the usb clock. This sets up pllb, but disables the * actual clock. @@ -267,20 +269,21 @@ * this relationship. */ mckr = RD4(sc, PMC_MCKR); + printf("mckr is %x\n", mckr); mck.parent = clock_list[mckr & 0x3]; mck.parent->refcnt++; freq = mck.parent->hz; freq /= 1 << ((mckr >> 2) & 3); mck.hz = freq / (1 + ((mckr >> 8) & 3)); - printf("Main clock is %x\n", RD4(sc, PMC_MCKR)); - - device_printf(sc->dev, "main clock = %d Hz PLLA = %d Hz CPU %d Hz main %d Hz\n", + device_printf(sc->dev, + "main clock: %d Hz PLLA: %d MHz CPU: %d MHz main %d MHz\n", sc->main_clock_hz, - at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0), - freq, mck.hz); + at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0) / 1000000, + freq / 1000000, mck.hz / 1000000); WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); + WR4(sc, PMC_PCER, 0xffffffff); } static void From owner-p4-projects@FreeBSD.ORG Tue Feb 21 20:33: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 16A3516A423; Tue, 21 Feb 2006 20:33:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C829716A422 for ; Tue, 21 Feb 2006 20:32:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DAEE43DAB for ; Tue, 21 Feb 2006 20:32:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LKWhZX063065 for ; Tue, 21 Feb 2006 20:32:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LKWL02063061 for perforce@freebsd.org; Tue, 21 Feb 2006 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 21 Feb 2006 20:32:21 GMT Message-Id: <200602212032.k1LKWL02063061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92142 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, 21 Feb 2006 20:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=92142 Change 92142 by rwatson@rwatson_zoo on 2006/02/21 20:32:17 Integrate TrustedBSD audit3 branch from TrustedBSD base: - snmp updates - OpenBSM update to 1.0a4. - NO_AUDIT - atheros driver, 802.11 updates - Normal plethora of driver tweaks, meta-data additions, bug fixes, etc. - Accounting fixup. - Audit arguments to signal, process system calls. - Page size jumbo mbuf clusters. - Various audit bug fixes. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#7 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#8 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/ln.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ln/ln.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/export.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/audit3/etc/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#10 integrate .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#3 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/SERVERS#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/abi#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/localpkg#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/named#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netif#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pccard#3 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/root#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#6 integrate .. //depot/projects/trustedbsd/audit3/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/grep/search.c#6 integrate .. //depot/projects/trustedbsd/audit3/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_set_policy.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_strerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libpthread_db.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libthr_db.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libutil/libutil.h#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gbde/gbde.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/gbde/gbde.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mca/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/audit3/sbin/mdconfig/mdconfig.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/trustedbsd/audit3/secure/usr.sbin/sshd/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/agp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ataraid.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/atkbd.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/lp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/acpi_ibm.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_one2many.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ohci.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/syscons.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vga.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/group.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/acl.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/buf.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/memguard.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ja_JP.SJIS.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ja_JP.eucJP.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#17 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/asr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/mii.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/fc_log.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohcivar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umass.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umct.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_slice.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_slice.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/geode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/mca.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_proc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/arcnet/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/bt3c/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nfs4client/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gre.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/radix.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_intel.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_pcn.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sis.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sk.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_ste.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_wb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/db_trace.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/eeprom.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/mbuf.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/uma_core.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/column/column.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mbuf.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/vmstat/vmstat.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/wall/wall.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/who/who.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hcsecd/hcsecd.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/moused/moused.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/powerd/powerd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/network.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/audit3/UPDATING#8 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/csh/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/audit3/bin/csh/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/audit3/bin/ln/ln.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/audit3/bin/ln/ln.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/audit3/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#2 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#5 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 21 21:51: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 B935B16A424; Tue, 21 Feb 2006 21:51:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 775D716A420 for ; Tue, 21 Feb 2006 21:51:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA42C43D64 for ; Tue, 21 Feb 2006 21:51:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LLpI3P078273 for ; Tue, 21 Feb 2006 21:51:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LLpHPr078269 for perforce@freebsd.org; Tue, 21 Feb 2006 21:51:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Feb 2006 21:51:18 GMT Message-Id: <200602212151.k1LLpHPr078269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92144 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, 21 Feb 2006 21:51:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92144 Change 92144 by jhb@jhb_slimer on 2006/02/21 21:51:15 Axe the callout_wait mutex and instead just use msleep_spin with the callout_lock spin lock directly. Affected files ... .. //depot/projects/smpng/sys/kern/kern_timeout.c#27 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_timeout.c#27 (text+ko) ==== @@ -85,31 +85,18 @@ * guarantees that the current callout will not run. * The softclock() function sets this to 0 before it * drops callout_lock to acquire c_mtx, and it calls - * the handler only if curr_cancelled still 0 when + * the handler only if curr_cancelled is still 0 after * c_mtx is successfully acquired. - * wakeup_ctr - Incremented every time a thread wants to wait - * for a callout to complete. Modified only when + * wakeup_needed - If a thread is waiting on callout_wait, then + * wakeup_needed is nonzero. Set only when * curr_callout is non-NULL. - * wakeup_needed - If a thread is waiting on callout_wait, then - * wakeup_needed is nonzero. Increased only when - * cutt_callout is non-NULL. + * callout_wait - Placeholder for a wait channel. */ static struct callout *curr_callout; static int curr_cancelled; -static int wakeup_ctr; static int wakeup_needed; +static int callout_wait; -/** - * Locked by callout_wait_lock: - * callout_wait - If wakeup_needed is set, callout_wait will be - * triggered after the current callout finishes. - * wakeup_done_ctr - Set to the current value of wakeup_ctr after - * callout_wait is triggered. - */ -static struct mtx callout_wait_lock; -static struct cv callout_wait; -static int wakeup_done_ctr; - /* * kern_timeout_callwheel_alloc() - kernel low level callwheel initialization * @@ -157,8 +144,6 @@ TAILQ_INIT(&callwheel[i]); } mtx_init(&callout_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE); - mtx_init(&callout_wait_lock, "callout_wait_lock", NULL, MTX_DEF); - cv_init(&callout_wait, "callout_wait"); } /* @@ -188,7 +173,6 @@ int mpcalls; int mtxcalls; int gcalls; - int wakeup_cookie; #ifdef DIAGNOSTIC struct bintime bt1, bt2; struct timespec ts2; @@ -316,13 +300,7 @@ * There might be someone waiting * for the callout to complete. */ - wakeup_cookie = wakeup_ctr; - mtx_unlock_spin(&callout_lock); - mtx_lock(&callout_wait_lock); - cv_broadcast(&callout_wait); - wakeup_done_ctr = wakeup_cookie; - mtx_unlock(&callout_wait_lock); - mtx_lock_spin(&callout_lock); + wakeup(&callout_wait); wakeup_needed = 0; } steps = 0; @@ -497,7 +475,7 @@ struct callout *c; int safe; { - int use_mtx, wakeup_cookie; + int rval, use_mtx; if (!safe && c->c_mtx != NULL) { #ifdef notyet /* Some callers do not hold Giant for Giant-locked callouts. */ @@ -520,30 +498,21 @@ mtx_unlock_spin(&callout_lock); return (0); } + rval = 0; if (safe) { /* We need to wait until the callout is finished. */ - wakeup_needed = 1; - wakeup_cookie = wakeup_ctr++; - mtx_unlock_spin(&callout_lock); - mtx_lock(&callout_wait_lock); - - /* - * Check to make sure that softclock() didn't - * do the wakeup in between our dropping - * callout_lock and picking up callout_wait_lock - */ - if (wakeup_cookie - wakeup_done_ctr > 0) - cv_wait(&callout_wait, &callout_wait_lock); - - mtx_unlock(&callout_wait_lock); + while (c == curr_callout) { + wakeup_needed = 1; + msleep_spin(&callout_wait, &callout_lock, + "costop", 0); + } } else if (use_mtx && !curr_cancelled) { /* We can stop the callout before it runs. */ curr_cancelled = 1; - mtx_unlock_spin(&callout_lock); - return (1); - } else - mtx_unlock_spin(&callout_lock); - return (0); + rval = 1; + } + mtx_unlock_spin(&callout_lock); + return (rval); } c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING); From owner-p4-projects@FreeBSD.ORG Tue Feb 21 22:35:14 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 BAAA316A423; Tue, 21 Feb 2006 22:35:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BE6016A420 for ; Tue, 21 Feb 2006 22:35:13 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FB2343D53 for ; Tue, 21 Feb 2006 22:35:13 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LMZDU4080010 for ; Tue, 21 Feb 2006 22:35:13 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LMZDBQ080007 for perforce@freebsd.org; Tue, 21 Feb 2006 22:35:13 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 22:35:13 GMT Message-Id: <200602212235.k1LMZDBQ080007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92149 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, 21 Feb 2006 22:35:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92149 Change 92149 by csjp@csjp_xor on 2006/02/21 22:34:55 Further reduce namespace pollution in su(1) by conditionally including audit/bsm includes. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 (text+ko) ==== @@ -81,8 +81,10 @@ #include #include +#ifdef USE_BSM_AUDIT #include #include +#endif #include #include @@ -145,7 +147,9 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); +#ifdef USE_BSM_AUDIT static void audit_su(au_id_t, int, const char *, ...); +#endif extern char **environ; From owner-p4-projects@FreeBSD.ORG Tue Feb 21 22:45: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 6663F16A423; Tue, 21 Feb 2006 22:45:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F96A16A420 for ; Tue, 21 Feb 2006 22:45:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1480543D45 for ; Tue, 21 Feb 2006 22:45:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LMjQGr080509 for ; Tue, 21 Feb 2006 22:45:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LMjPZf080506 for perforce@freebsd.org; Tue, 21 Feb 2006 22:45:25 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Feb 2006 22:45:25 GMT Message-Id: <200602212245.k1LMjPZf080506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92150 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, 21 Feb 2006 22:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92150 Change 92150 by jhb@jhb_slimer on 2006/02/21 22:44:35 - Don't use callout_drain() when we can't use it. - Axe unused callout tohandle. Affected files ... .. //depot/projects/smpng/sys/dev/fdc/fdc.c#20 edit Differences ... ==== //depot/projects/smpng/sys/dev/fdc/fdc.c#20 (text+ko) ==== @@ -250,7 +250,6 @@ #define FD_NO_TRACK -2 int options; /* FDOPT_* */ struct callout toffhandle; - struct callout tohandle; struct g_geom *fd_geom; struct g_provider *fd_provider; device_t dev; @@ -647,7 +646,12 @@ fdc->fdout |= (FDO_MOEN0 << fd->fdsu); callout_reset(&fd->toffhandle, hz, fd_turnon, fd); } else { - callout_drain(&fd->toffhandle); + /* + * We can't call drain from a callout and we can't call it + * while holding a lock needed by the callout being drained, + * so use stop for now. + */ + callout_stop(&fd->toffhandle); fd->flags &= ~(FD_MOTOR|FD_MOTORWAIT); fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu); } @@ -1199,7 +1203,8 @@ mtx_lock(&fdc->fdc_mtx); /* If we go from idle, cancel motor turnoff */ if (fd->fd_iocount++ == 0) - callout_drain(&fd->toffhandle); + /* XXX: Can't drain while holding mutex. */ + callout_stop(&fd->toffhandle); if (fd->flags & FD_MOTOR) { /* The motor is on, send it directly to the controller */ bioq_disksort(&fdc->head, bp); @@ -1940,7 +1945,6 @@ fd->fdsu = fdsu; fd->options = 0; callout_init(&fd->toffhandle, 1); - callout_init(&fd->tohandle, 1); /* initialize densities for subdevices */ fdsettype(fd, fd_native_types[fd->type]); From owner-p4-projects@FreeBSD.ORG Wed Feb 22 02:52: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 332FE16A424; Wed, 22 Feb 2006 02:52:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90A2516A422 for ; Wed, 22 Feb 2006 02:52:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F12843D45 for ; Wed, 22 Feb 2006 02:52:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1M2qXpB098011 for ; Wed, 22 Feb 2006 02:52:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1M2qXlM098008 for perforce@freebsd.org; Wed, 22 Feb 2006 02:52:33 GMT (envelope-from wsalamon@computer.org) Date: Wed, 22 Feb 2006 02:52:33 GMT Message-Id: <200602220252.k1M2qXlM098008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 92172 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, 22 Feb 2006 02:52:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92172 Change 92172 by wsalamon@gretsch on 2006/02/22 02:51:36 Bring the kern_futimes() function in agreement with the current FreeBSD CVS version. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#27 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#27 (text+ko) ==== @@ -2971,11 +2971,10 @@ int error; AUDIT_ARG(fd, fd); + if ((error = getutimes(tptr, tptrseg, ts)) != 0) + return (error); if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); - - if ((error = getutimes(tptr, tptrseg, ts)) != 0) - return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL); VFS_UNLOCK_GIANT(vfslocked); From owner-p4-projects@FreeBSD.ORG Wed Feb 22 18:01: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 CCF2016A423; Wed, 22 Feb 2006 18:01:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85C0116A422 for ; Wed, 22 Feb 2006 18:01:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C67643D7B for ; Wed, 22 Feb 2006 18:01:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MI1BWD069616 for ; Wed, 22 Feb 2006 18:01:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MI1Aob069613 for perforce@freebsd.org; Wed, 22 Feb 2006 18:01:10 GMT (envelope-from marcel@freebsd.org) Date: Wed, 22 Feb 2006 18:01:10 GMT Message-Id: <200602221801.k1MI1Aob069613@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 92212 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, 22 Feb 2006 18:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=92212 Change 92212 by marcel@marcel_nfs on 2006/02/22 18:00:55 IFC @92211 Affected files ... .. //depot/projects/uart/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/uart/arm/at91/at91st.c#2 delete .. //depot/projects/uart/arm/at91/files.at91#1 branch .. //depot/projects/uart/arm/at91/files.at91rm92#2 delete .. //depot/projects/uart/arm/at91/std.at91#1 branch .. //depot/projects/uart/arm/at91/std.at91rm92#2 delete .. //depot/projects/uart/arm/at91/std.kb920x#2 integrate .. //depot/projects/uart/conf/kmod.mk#18 integrate .. //depot/projects/uart/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#13 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#13 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#10 integrate .. //depot/projects/uart/dev/ata/ata-raid.h#8 integrate .. //depot/projects/uart/dev/ath/if_ath.c#22 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#16 integrate .. //depot/projects/uart/dev/bge/if_bge.c#22 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#11 integrate .. //depot/projects/uart/dev/em/if_em.c#20 integrate .. //depot/projects/uart/dev/em/if_em.h#18 integrate .. //depot/projects/uart/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/uart/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/uart/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/uart/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/uart/dev/isp/isp.c#11 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/uart/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/uart/dev/isp/isp_library.c#2 integrate .. //depot/projects/uart/dev/isp/isp_library.h#2 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#11 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/uart/dev/isp/isp_target.c#7 integrate .. //depot/projects/uart/dev/isp/isp_target.h#6 integrate .. //depot/projects/uart/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/uart/dev/isp/ispmbox.h#6 integrate .. //depot/projects/uart/dev/isp/ispreg.h#4 integrate .. //depot/projects/uart/dev/isp/ispvar.h#10 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/uart/dev/le/am7990.c#2 integrate .. //depot/projects/uart/dev/le/am79900.c#2 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/uart/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/uart/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/uart/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/uart/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/uart/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/uart/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/uart/dev/puc/puc.c#17 integrate .. //depot/projects/uart/dev/ral/if_ral.c#5 integrate .. //depot/projects/uart/dev/re/if_re.c#15 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/uart/dev/usb/if_ural.c#5 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/uart/dev/usb/usb_quirks.h#5 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#14 integrate .. //depot/projects/uart/dev/usb/usbdevs#18 integrate .. //depot/projects/uart/fs/deadfs/dead_vnops.c#7 integrate .. //depot/projects/uart/fs/devfs/devfs_devs.c#8 integrate .. //depot/projects/uart/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/uart/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/uart/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#11 integrate .. //depot/projects/uart/geom/geom_slice.c#5 integrate .. //depot/projects/uart/geom/geom_slice.h#2 integrate .. //depot/projects/uart/geom/label/g_label.c#5 integrate .. //depot/projects/uart/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/uart/i386/i386/identcpu.c#16 integrate .. //depot/projects/uart/i386/i386/pmap.c#29 integrate .. //depot/projects/uart/kern/kern_condvar.c#5 integrate .. //depot/projects/uart/kern/kern_exit.c#11 integrate .. //depot/projects/uart/kern/kern_kse.c#10 integrate .. //depot/projects/uart/kern/kern_kthread.c#5 integrate .. //depot/projects/uart/kern/kern_mbuf.c#7 integrate .. //depot/projects/uart/kern/kern_resource.c#9 integrate .. //depot/projects/uart/kern/kern_sig.c#23 integrate .. //depot/projects/uart/kern/kern_synch.c#13 integrate .. //depot/projects/uart/kern/kern_sysctl.c#8 integrate .. //depot/projects/uart/kern/kern_thread.c#20 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/uart/kern/uipc_domain.c#8 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#10 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#3 integrate .. //depot/projects/uart/kern/vfs_aio.c#12 integrate .. //depot/projects/uart/kern/vfs_mount.c#18 integrate .. //depot/projects/uart/kern/vfs_subr.c#20 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#19 integrate .. //depot/projects/uart/modules/Makefile#24 integrate .. //depot/projects/uart/modules/coda5/Makefile#4 integrate .. //depot/projects/uart/modules/dummynet/Makefile#3 integrate .. //depot/projects/uart/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/uart/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/uart/modules/firewire/sbp/Makefile#3 integrate .. //depot/projects/uart/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/uart/modules/if_vlan/Makefile#3 integrate .. //depot/projects/uart/modules/myri10ge/Makefile#1 branch .. //depot/projects/uart/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/uart/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/uart/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/uart/modules/netgraph/atm/Makefile#4 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/bluetooth/Makefile#4 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/bt3c/Makefile#4 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/h4/Makefile#4 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/ubt/Makefile#5 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/ubtbcmfw/Makefile#5 integrate .. //depot/projects/uart/modules/nfs4client/Makefile#3 integrate .. //depot/projects/uart/modules/nfsclient/Makefile#4 integrate .. //depot/projects/uart/modules/twa/Makefile#5 integrate .. //depot/projects/uart/net/if_media.h#7 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/uart/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/uart/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/uart/netinet/in_pcb.c#11 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#15 integrate .. //depot/projects/uart/netinet/tcp.h#7 integrate .. //depot/projects/uart/netinet/tcp_input.c#15 integrate .. //depot/projects/uart/netinet/tcp_sack.c#7 integrate .. //depot/projects/uart/netinet/tcp_subr.c#14 integrate .. //depot/projects/uart/netinet/tcp_timer.c#9 integrate .. //depot/projects/uart/netinet/tcp_timer.h#4 integrate .. //depot/projects/uart/netinet/tcp_var.h#9 integrate .. //depot/projects/uart/pci/agp_intel.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/db_trace.c#7 integrate .. //depot/projects/uart/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/uart/sys/mbuf.h#11 integrate .. //depot/projects/uart/sys/param.h#22 integrate .. //depot/projects/uart/sys/proc.h#18 integrate .. //depot/projects/uart/sys/sleepqueue.h#3 integrate .. //depot/projects/uart/sys/sysctl.h#9 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/uart/vm/vm_object.c#20 integrate .. //depot/projects/uart/vm/vm_page.c#18 integrate .. //depot/projects/uart/vm/vm_pageout.c#19 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); #include "opt_cpu.h" @@ -224,8 +224,8 @@ "\003RSVD2" /* "Reserved" bit 2 */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ - "\006" /* Machine specific registers */ - "\007" /* Physical address extension */ + "\006VMX" /* Virtual Machine Extensions */ + "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ "\012" ==== //depot/projects/uart/arm/at91/std.kb920x#2 (text) ==== @@ -1,5 +1,5 @@ -#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.1 2006/02/04 23:32:13 imp Exp $ -include "../at91/std.at91rm92" +#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.2 2006/02/17 22:33:13 imp Exp $ +include "../at91/std.at91" files "../at91/files.kb920x" makeoptions KERNPHYSADDR=0x20000000 ==== //depot/projects/uart/conf/kmod.mk#18 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.202 2006/02/04 06:22:27 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.205 2006/02/20 01:08:33 mlaier Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -137,13 +137,15 @@ .for _firmw in ${FIRMWS} ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} -.if !exists(${.CURDIR}/${_firmw:C/\:.*$//}) - ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//} - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} - rm -f ${_firmw:C/\:.*$//} -.else - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} -.endif + @if [ -e ${_firmw:C/\:.*$//} ]; then \ + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ + ${_firmw:C/\:.*$//}; \ + else \ + ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \ + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ + ${_firmw:C/\:.*$//}; \ + rm ${_firmw:C/\:.*$//}; \ + fi OBJS+= ${_firmw:C/\:.*$/.fwo/} .endfor @@ -240,7 +242,7 @@ esac ; \ path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET} "->" $$path ; \ - ln -s $$path ${.TARGET} + ln -sf $$path ${.TARGET} CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} @@ -299,7 +301,7 @@ CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - ln -s ${KERNBUILDDIR}/${_src} ${.TARGET} + ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else ==== //depot/projects/uart/dev/acpica/acpi_smbat.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.4 2006/01/12 21:56:37 bruno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.5 2006/02/21 03:16:58 njl Exp $"); #include "opt_acpi.h" #include @@ -134,9 +134,7 @@ static int acpi_smbat_shutdown(device_t dev) { - struct acpi_smbat_softc *sc; - sc = device_get_softc(dev); acpi_battery_remove(dev); return (0); } ==== //depot/projects/uart/dev/acpica/acpi_throttle.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.8 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.9 2006/02/21 03:15:26 njl Exp $"); #include "opt_acpi.h" #include @@ -345,10 +345,8 @@ static int acpi_thr_settings(device_t dev, struct cf_setting *sets, int *count) { - struct acpi_throttle_softc *sc; int i, speed; - sc = device_get_softc(dev); if (sets == NULL || count == NULL) return (EINVAL); if (*count < CPU_MAX_SPEED) ==== //depot/projects/uart/dev/ata/ata-chipset.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.158 2006/02/13 13:47:58 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.159 2006/02/16 17:09:24 sos Exp $"); #include "opt_ata.h" #include @@ -100,6 +100,10 @@ static int ata_ite_chipinit(device_t dev); static void ata_ite_setmode(device_t dev, int mode); static int ata_jmicron_chipinit(device_t dev); +static int ata_jmicron_allocate(device_t dev); +static void ata_jmicron_reset(device_t dev); +static void ata_jmicron_dmainit(device_t dev); +static void ata_jmicron_setmode(device_t dev, int mode); static int ata_marvell_chipinit(device_t dev); static int ata_marvell_allocate(device_t dev); static int ata_marvell_status(device_t dev); @@ -2065,6 +2069,7 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_JMB360, 0, 0, 0, ATA_SA300, "JMB360" }, + { ATA_JMB363, 0, 1, 0, ATA_SA300, "JMB363" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -2087,49 +2092,110 @@ if (ata_setup_interrupt(dev)) return ENXIO; + /* set controller configuration to a setup we support */ + pci_write_config(dev, 0x40, 0x80c0a131, 4); + + ctlr->allocate = ata_jmicron_allocate; + ctlr->reset = ata_jmicron_reset; + ctlr->dmainit = ata_jmicron_dmainit; + ctlr->setmode = ata_jmicron_setmode; + ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = PCIR_BAR(5); - if (!(ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, - &ctlr->r_rid2, RF_ACTIVE))) - return ENXIO; + if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, + &ctlr->r_rid2, RF_ACTIVE))) { + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2,ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + + /* enable AHCI mode */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); + + /* get the number of HW channels */ + ctlr->channels = + (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK) + 1; + + /* clear interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); + + /* enable AHCI interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); + + /* enable PCI interrupt */ + pci_write_config(dev, PCIR_COMMAND, + pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); + } + /* add in PATA channel(s) */ + ctlr->channels += ctlr->chip->cfg1; + return 0; +} - /* enable AHCI mode */ - pci_write_config(dev, 0x41, 0xa1, 1); +static int +ata_jmicron_allocate(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + int error; - /* reset AHCI controller */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); - DELAY(1000000); - if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { - bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2); - device_printf(dev, "AHCI controller reset failure\n"); - return ENXIO; + if (ch->unit >= 2) { + ch->unit -= 2; + error = ata_pci_allocate(dev); + ch->unit += 2; } + else + error = ata_ahci_allocate(dev); + return error; +} + +static void +ata_jmicron_reset(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); - /* enable AHCI mode */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); + if (ch->unit >= 2) + ata_generic_reset(dev); + else + ata_ahci_reset(dev); +} + +static void +ata_jmicron_dmainit(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); - /* get the number of HW channels */ - ctlr->channels = (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK) +1; + if (ch->unit >= 2) + ata_pci_dmainit(dev); + else + ata_ahci_dmainit(dev); +} - ctlr->allocate = ata_ahci_allocate; - ctlr->reset = ata_ahci_reset; - ctlr->dmainit = ata_ahci_dmainit; - ctlr->setmode = ata_sata_setmode; +static void +ata_jmicron_setmode(device_t dev, int mode) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(dev)); - /* clear interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); + if (ch->unit >= 2) { + struct ata_device *atadev = device_get_softc(dev); - /* enable AHCI interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); + /* check for 80pin cable present */ + if (pci_read_config(dev, 0x40, 1) & 0x08) + mode = ata_limit_mode(dev, mode, ATA_UDMA2); + else + mode = ata_limit_mode(dev, mode, ATA_UDMA6); - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); - return 0; + if (!ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) + atadev->mode = mode; + } + else + ata_sata_setmode(dev, mode); } ==== //depot/projects/uart/dev/ata/ata-pci.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.115 2006/02/09 20:53:32 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.116 2006/02/16 17:09:24 sos Exp $"); #include "opt_ata.h" #include @@ -59,9 +59,6 @@ #define IOMASK 0xfffffffc #define ATA_PROBE_OK -10 -/* prototypes */ -static void ata_pci_dmainit(device_t); - int ata_legacy(device_t dev) { @@ -505,7 +502,7 @@ ch->dma->unload(dev); } -static void +void ata_pci_dmainit(device_t dev) { struct ata_channel *ch = device_get_softc(dev); ==== //depot/projects/uart/dev/ata/ata-pci.h#13 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-pci.h,v 1.62 2006/01/25 23:07:42 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.63 2006/02/16 17:09:24 sos Exp $ */ /* structure holding chipset config info */ @@ -161,6 +161,7 @@ #define ATA_JMICRON_ID 0x197b #define ATA_JMB360 0x2360197b +#define ATA_JMB363 0x2363197b #define ATA_MARVELL_ID 0x11ab #define ATA_M88SX5040 0x504011ab @@ -401,6 +402,7 @@ int ata_pci_allocate(device_t dev); void ata_pci_hw(device_t dev); int ata_pci_status(device_t dev); +void ata_pci_dmainit(device_t); /* global prototypes ata-chipset.c */ ==== //depot/projects/uart/dev/ata/ata-raid.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.117 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.118 2006/02/17 13:02:09 sos Exp $"); #include "opt_ata.h" #include @@ -71,6 +71,8 @@ static int ata_raid_intel_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_intel_write_meta(struct ar_softc *rdp); static int ata_raid_ite_read_meta(device_t dev, struct ar_softc **raidp); +static int ata_raid_jmicron_read_meta(device_t dev, struct ar_softc **raidp); +static int ata_raid_jmicron_write_meta(struct ar_softc *rdp); static int ata_raid_lsiv2_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_lsiv3_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_nvidia_read_meta(device_t dev, struct ar_softc **raidp); @@ -95,6 +97,7 @@ static void ata_raid_hptv3_print_meta(struct hptv3_raid_conf *meta); static void ata_raid_intel_print_meta(struct intel_raid_conf *meta); static void ata_raid_ite_print_meta(struct ite_raid_conf *meta); +static void ata_raid_jmicron_print_meta(struct jmicron_raid_conf *meta); static void ata_raid_lsiv2_print_meta(struct lsiv2_raid_conf *meta); static void ata_raid_lsiv3_print_meta(struct lsiv3_raid_conf *meta); static void ata_raid_nvidia_print_meta(struct nvidia_raid_conf *meta); @@ -937,6 +940,11 @@ rdp->disks[disk].sectors = ITE_LBA(rdp->disks[disk].dev); break; + case ATA_JMICRON_ID: + ctlr = AR_F_JMICRON_RAID; + rdp->disks[disk].sectors = JMICRON_LBA(rdp->disks[disk].dev); + break; + case 0: /* XXX SOS cover up for bug in our PCI code */ case ATA_PROMISE_ID: ctlr = AR_F_PROMISE_RAID; @@ -1072,6 +1080,10 @@ rdp->interleave = min(max(2, rdp->interleave), 128); /*+*/ break; + case AR_F_JMICRON_RAID: + rdp->interleave = min(max(8, rdp->interleave), 256); /*+*/ + break; + case AR_F_LSIV2_RAID: rdp->interleave = min(max(2, rdp->interleave), 4096); break; @@ -1274,6 +1286,11 @@ return 0; break; + case ATA_JMICRON_ID: + if (ata_raid_jmicron_read_meta(subdisk, ata_raid_arrays)) + return 0; + break; + case ATA_NVIDIA_ID: if (ata_raid_nvidia_read_meta(subdisk, ata_raid_arrays)) return 0; @@ -1339,6 +1356,9 @@ case AR_F_INTEL_RAID: return ata_raid_intel_write_meta(rdp); + case AR_F_JMICRON_RAID: + return ata_raid_jmicron_write_meta(rdp); + case AR_F_SIS_RAID: return ata_raid_sis_write_meta(rdp); @@ -1410,6 +1430,11 @@ size = sizeof(struct ite_raid_conf); break; + case AR_F_JMICRON_RAID: + lba = JMICRON_LBA(rdp->disks[disk].dev); + size = sizeof(struct jmicron_raid_conf); + break; + case AR_F_LSIV2_RAID: lba = LSIV2_LBA(rdp->disks[disk].dev); size = sizeof(struct lsiv2_raid_conf); @@ -2392,6 +2417,231 @@ return retval; } +/* JMicron Technology Corp Metadata */ +static int +ata_raid_jmicron_read_meta(device_t dev, struct ar_softc **raidp) +{ + struct ata_raid_subdisk *ars = device_get_softc(dev); + device_t parent = device_get_parent(dev); + struct jmicron_raid_conf *meta; + struct ar_softc *raid = NULL; + u_int16_t checksum, *ptr; + u_int64_t disk_size; + int count, array, disk, total_disks, retval = 0; + + if (!(meta = (struct jmicron_raid_conf *) + malloc(sizeof(struct jmicron_raid_conf), M_AR, M_NOWAIT | M_ZERO))) + return ENOMEM; + + if (ata_raid_rw(parent, JMICRON_LBA(parent), + meta, sizeof(struct jmicron_raid_conf), ATA_R_READ)) { + if (testing || bootverbose) + device_printf(parent, + "JMicron read metadata failed\n"); + } + + /* check for JMicron signature */ + if (strncmp(meta->signature, JMICRON_MAGIC, 2)) { + if (testing || bootverbose) + device_printf(parent, "JMicron check1 failed\n"); + goto jmicron_out; + } + + /* calculate checksum and compare for valid */ + for (checksum = 0, ptr = (u_int16_t *)meta, count = 0; count < 64; count++) + checksum += *ptr++; + if (checksum) { + if (testing || bootverbose) + device_printf(parent, "JMicron check2 failed\n"); + goto jmicron_out; + } + + if (testing || bootverbose) + ata_raid_jmicron_print_meta(meta); + + /* now convert JMicron meta into our generic form */ + for (array = 0; array < MAX_ARRAYS; array++) { +jmicron_next: + if (!raidp[array]) { + raidp[array] = + (struct ar_softc *)malloc(sizeof(struct ar_softc), M_AR, + M_NOWAIT | M_ZERO); + if (!raidp[array]) { + device_printf(parent, "failed to allocate metadata storage\n"); + goto jmicron_out; + } + } + raid = raidp[array]; + if (raid->format && (raid->format != AR_F_JMICRON_RAID)) + continue; + + for (total_disks = 0, disk = 0; disk < JM_MAX_DISKS; disk++) { + if (meta->disks[disk]) { + if (raid->format == AR_F_JMICRON_RAID) { + if (bcmp(&meta->disks[disk], + raid->disks[disk].serial, sizeof(u_int32_t))) { + array++; + goto jmicron_next; + } + } + else + bcopy(&meta->disks[disk], + raid->disks[disk].serial, sizeof(u_int32_t)); + total_disks++; + } + } + /* handle spares XXX SOS */ + + switch (meta->type) { + case JM_T_RAID0: + raid->type = AR_T_RAID0; + raid->width = total_disks; + break; + + case JM_T_RAID1: + raid->type = AR_T_RAID1; + raid->width = 1; + break; + + case JM_T_RAID01: + raid->type = AR_T_RAID01; + raid->width = total_disks / 2; + break; + + case JM_T_RAID5: + raid->type = AR_T_RAID5; + raid->width = total_disks; + break; + + case JM_T_JBOD: + raid->type = AR_T_SPAN; + raid->width = 1; + break; + + default: + device_printf(parent, + "JMicron unknown RAID type 0x%02x\n", meta->type); + free(raidp[array], M_AR); + raidp[array] = NULL; + goto jmicron_out; + } + disk_size = (meta->disk_sectors_high << 16) + meta->disk_sectors_low; + raid->format = AR_F_JMICRON_RAID; + strncpy(raid->name, meta->name, sizeof(meta->name)); + raid->generation = 0; + raid->interleave = 2 << meta->stripe_shift; + raid->total_disks = total_disks; + raid->total_sectors = disk_size * (raid->width-(raid->type==AR_RAID5)); + raid->heads = 255; + raid->sectors = 63; + raid->cylinders = raid->total_sectors / (63 * 255); + raid->offset_sectors = meta->offset * 16; + raid->rebuild_lba = 0; + raid->lun = array; + + for (disk = 0; disk < raid->total_disks; disk++) { + if (meta->disks[disk] == meta->disk_id) { + raid->disks[disk].dev = parent; + raid->disks[disk].sectors = disk_size; + raid->disks[disk].flags = + (AR_DF_ONLINE | AR_DF_PRESENT | AR_DF_ASSIGNED); + ars->raid[raid->volume] = raid; + ars->disk_number[raid->volume] = disk; + retval = 1; + break; + } + } + break; + } +jmicron_out: + free(meta, M_AR); + return retval; +} + +static int +ata_raid_jmicron_write_meta(struct ar_softc *rdp) +{ + struct jmicron_raid_conf *meta; + u_int64_t disk_sectors; + int disk, error = 0; + + if (!(meta = (struct jmicron_raid_conf *) + malloc(sizeof(struct jmicron_raid_conf), M_AR, M_NOWAIT | M_ZERO))) { + printf("ar%d: failed to allocate metadata storage\n", rdp->lun); + return ENOMEM; + } + + rdp->generation++; + switch (rdp->type) { + case AR_T_JBOD: + meta->type = JM_T_JBOD; + break; + + case AR_T_RAID0: + meta->type = JM_T_RAID0; + break; + + case AR_T_RAID1: + meta->type = JM_T_RAID1; + break; + + case AR_T_RAID5: + meta->type = JM_T_RAID5; + break; + + case AR_T_RAID01: + meta->type = JM_T_RAID01; + break; + + default: + free(meta, M_AR); + return ENODEV; + } + bcopy(JMICRON_MAGIC, meta->signature, sizeof(JMICRON_MAGIC)); + meta->version = JMICRON_VERSION; + meta->offset = rdp->offset_sectors / 16; + disk_sectors = rdp->total_sectors / (rdp->width - (rdp->type == AR_RAID5)); + meta->disk_sectors_low = disk_sectors & 0xffff; + meta->disk_sectors_high = disk_sectors >> 16; + strncpy(meta->name, rdp->name, sizeof(meta->name)); + meta->stripe_shift = ffs(rdp->interleave) - 2; + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (rdp->disks[disk].serial[0]) + bcopy(rdp->disks[disk].serial,&meta->disks[disk],sizeof(u_int32_t)); + else + meta->disks[disk] = (u_int32_t)(uintptr_t)rdp->disks[disk].dev; + } + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (rdp->disks[disk].dev) { + u_int16_t checksum = 0, *ptr; + int count; + + meta->disk_id = meta->disks[disk]; + meta->checksum = 0; + for (ptr = (u_int16_t *)meta, count = 0; count < 64; count++) + checksum += *ptr++; + meta->checksum -= checksum; + + if (testing || bootverbose) + ata_raid_jmicron_print_meta(meta); + + if (ata_raid_rw(rdp->disks[disk].dev, + JMICRON_LBA(rdp->disks[disk].dev), + meta, sizeof(struct jmicron_raid_conf), + ATA_R_WRITE | ATA_R_DIRECT)) { + device_printf(rdp->disks[disk].dev, "write metadata failed\n"); + error = EIO; + } + } + } + /* handle spares XXX SOS */ + + free(meta, M_AR); + return error; +} + /* LSILogic V2 MegaRAID Metadata */ static int ata_raid_lsiv2_read_meta(device_t dev, struct ar_softc **raidp) @@ -3600,6 +3850,7 @@ free(meta, M_AR); return retval; } + static int ata_raid_via_write_meta(struct ar_softc *rdp) { @@ -3931,6 +4182,7 @@ case AR_F_HPTV3_RAID: return "HighPoint v3 RocketRAID"; case AR_F_INTEL_RAID: return "Intel MatrixRAID"; case AR_F_ITE_RAID: return "Integrated Technology Express"; + case AR_F_JMICRON_RAID: return "JMicron Technology Corp"; case AR_F_LSIV2_RAID: return "LSILogic v2 MegaRAID"; case AR_F_LSIV3_RAID: return "LSILogic v3 MegaRAID"; case AR_F_NVIDIA_RAID: return "nVidia MediaShield"; @@ -4301,6 +4553,48 @@ } static char * +ata_raid_jmicron_type(int type) +{ + static char buffer[16]; + + switch (type) { + case JM_T_RAID0: return "RAID0"; + case JM_T_RAID1: return "RAID1"; + case JM_T_RAID01: return "RAID0+1"; + case JM_T_JBOD: return "JBOD"; + case JM_T_RAID5: return "RAID5"; + default: sprintf(buffer, "UNKNOWN 0x%02x", type); + return buffer; + } +} + +static void +ata_raid_jmicron_print_meta(struct jmicron_raid_conf *meta) +{ + int i; + + printf("***** ATA JMicron Technology Corp Metadata ******\n"); + printf("signature %.2s\n", meta->signature); + printf("version 0x%04x\n", meta->version); + printf("checksum 0x%04x\n", meta->checksum); + printf("disk_id 0x%08x\n", meta->disk_id); + printf("offset 0x%08x\n", meta->offset); + printf("disk_sectors_low 0x%08x\n", meta->disk_sectors_low); + printf("disk_sectors_high 0x%08x\n", meta->disk_sectors_high); + printf("name %.16s\n", meta->name); + printf("type %s\n", ata_raid_jmicron_type(meta->type)); + printf("stripe_shift %d\n", meta->stripe_shift); + printf("flags 0x%04x\n", meta->flags); + printf("spare:\n"); + for (i=0; i < 2 && meta->spare[i]; i++) + printf(" %d 0x%08x\n", i, meta->spare[i]); + printf("disks:\n"); + for (i=0; i < 8 && meta->disks[i]; i++) + printf(" %d 0x%08x\n", i, meta->disks[i]); + printf("=================================================\n"); +} + +static char * ata_raid_lsiv2_type(int type) { static char buffer[16]; ==== //depot/projects/uart/dev/ata/ata-raid.h#8 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-raid.h,v 1.43 2006/01/18 13:10:17 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.44 2006/02/17 13:02:10 sos Exp $ */ /* misc defines */ @@ -68,13 +68,14 @@ #define AR_F_HPTV3_RAID 0x0008 #define AR_F_INTEL_RAID 0x0010 #define AR_F_ITE_RAID 0x0020 -#define AR_F_LSIV2_RAID 0x0040 -#define AR_F_LSIV3_RAID 0x0080 -#define AR_F_NVIDIA_RAID 0x0100 -#define AR_F_PROMISE_RAID 0x0200 -#define AR_F_SII_RAID 0x0400 -#define AR_F_SIS_RAID 0x0800 -#define AR_F_VIA_RAID 0x1000 +#define AR_F_JMICRON_RAID 0x0040 +#define AR_F_LSIV2_RAID 0x0080 +#define AR_F_LSIV3_RAID 0x0100 +#define AR_F_NVIDIA_RAID 0x0200 +#define AR_F_PROMISE_RAID 0x0400 +#define AR_F_SII_RAID 0x0800 +#define AR_F_SIS_RAID 0x1000 +#define AR_F_VIA_RAID 0x2000 #define AR_F_FORMAT_MASK 0x1fff u_int generation; @@ -398,6 +399,50 @@ } __packed; +/* JMicron Technology Corp Metadata */ +#define JMICRON_LBA(dev) \ + (((struct ad_softc *)device_get_ivars(dev))->total_secs - 1) +#define JM_MAX_DISKS 8 + +struct jmicron_raid_conf { + u_int8_t signature[2]; +#define JMICRON_MAGIC "JM" + + u_int16_t version; +#define JMICRON_VERSION 0x0001 + + u_int16_t checksum; + u_int8_t filler_1[10]; + u_int32_t disk_id; + u_int32_t offset; + u_int32_t disk_sectors_high; + u_int16_t disk_sectors_low; + u_int8_t filler_2[2]; + u_int8_t name[16]; + u_int8_t type; +#define JM_T_RAID0 0 +#define JM_T_RAID1 1 +#define JM_T_RAID01 2 +#define JM_T_JBOD 3 +#define JM_T_RAID5 5 + + u_int8_t stripe_shift; + u_int16_t flags; +#define JM_F_READY 0x0001 +#define JM_F_BOOTABLE 0x0002 +#define JM_F_BAD 0x0004 +#define JM_F_ACTIVE 0c0010 +#define JM_F_UNSYNC 0c0020 +#define JM_F_NEWEST 0c0040 + + u_int8_t filler_3[4]; + u_int32_t spare[2]; + u_int32_t disks[JM_MAX_DISKS]; + u_int8_t filler_4[32]; + u_int8_t filler_5[384]; +}; + + /* LSILogic V2 MegaRAID Metadata */ #define LSIV2_LBA(dev) \ (((struct ad_softc *)device_get_ivars(dev))->total_secs - 1) ==== //depot/projects/uart/dev/ath/if_ath.c#22 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.127 2006/02/13 18:23:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.135 2006/02/15 18:36:52 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -256,13 +256,17 @@ if (sc->sc_debug & ATH_DEBUG_KEYCACHE) \ ath_keyprint(__func__, ix, hk, mac); \ } while (0) -static void ath_printrxbuf(struct ath_buf *bf, int); -static void ath_printtxbuf(struct ath_buf *bf, int); +static void ath_printrxbuf(struct ath_buf *bf, u_int ix, int); +static void ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done); #else #define IFF_DUMPPKTS(sc, m) \ ((sc->sc_ifp->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 22 18:35: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 11CD016A423; Wed, 22 Feb 2006 18:35:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0F7916A420 for ; Wed, 22 Feb 2006 18:35:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8170B43D60 for ; Wed, 22 Feb 2006 18:35:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MIZHiD071237 for ; Wed, 22 Feb 2006 18:35:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MIYvhP071125 for perforce@freebsd.org; Wed, 22 Feb 2006 18:34:57 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 18:34:57 GMT Message-Id: <200602221834.k1MIYvhP071125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92214 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, 22 Feb 2006 18:35:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92214 Change 92214 by jhb@jhb_slimer on 2006/02/22 18:34:12 IFC @92213. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#83 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#35 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#64 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#20 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#18 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#16 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#16 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#18 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#41 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#32 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#42 integrate .. //depot/projects/smpng/sys/amd64/amd64/tsc.c#5 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#11 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#15 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91var.h#1 branch .. //depot/projects/smpng/sys/arm/at91/files.at91#1 branch .. //depot/projects/smpng/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/smpng/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/smpng/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/smpng/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/smpng/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/at91/std.at91#1 branch .. //depot/projects/smpng/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/smpng/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/smpng/sys/arm/conf/KB920X#1 branch .. //depot/projects/smpng/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/smpng/sys/arm/include/atomic.h#23 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/smpng/sys/bsm/audit.h#3 integrate .. //depot/projects/smpng/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#32 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#30 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#44 integrate .. //depot/projects/smpng/sys/conf/NOTES#114 integrate .. //depot/projects/smpng/sys/conf/files#167 integrate .. //depot/projects/smpng/sys/conf/files.amd64#39 integrate .. //depot/projects/smpng/sys/conf/files.i386#93 integrate .. //depot/projects/smpng/sys/conf/files.pc98#79 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#52 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#55 integrate .. //depot/projects/smpng/sys/conf/options#115 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#14 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_smbat.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#39 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#25 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#22 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#51 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#20 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#31 integrate .. //depot/projects/smpng/sys/dev/asr/i2odep.h#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#79 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#43 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#63 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#61 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#45 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#27 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#35 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#12 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#22 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#21 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#71 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/smpng/sys/dev/cs/if_csvar.h#6 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#16 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#66 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#31 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#27 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#20 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#12 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#72 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#40 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/smpng/sys/dev/isp/isp.c#38 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#37 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#28 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#15 delete .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/smpng/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#33 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#16 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#19 integrate .. //depot/projects/smpng/sys/dev/isp/ispreg.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#28 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#14 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#2 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#2 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#34 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/smpng/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#5 integrate .. //depot/projects/smpng/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/smpng/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/smpng/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/smpng/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/smpng/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/smpng/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/smpng/sys/dev/nge/if_nge.c#48 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#55 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#4 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#15 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#13 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#27 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#14 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#36 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#59 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#39 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#29 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#12 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#21 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#26 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#40 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#54 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#86 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#15 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#21 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#15 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#24 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#44 integrate .. //depot/projects/smpng/sys/fs/udf/ecma167-udf.h#5 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#34 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#33 integrate .. //depot/projects/smpng/sys/geom/geom_slice.h#15 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#12 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#25 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#10 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#22 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#115 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#3 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#102 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#97 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#92 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#92 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#22 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix#6 integrate .. //depot/projects/smpng/sys/i386/include/xbox.h#2 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#32 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#21 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#22 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#22 integrate .. //depot/projects/smpng/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/smpng/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#21 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#101 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#32 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#78 integrate .. //depot/projects/smpng/sys/kern/init_main.c#59 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#94 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#80 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#53 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#66 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#68 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#46 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#43 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#69 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#90 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#121 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#98 integrate .. //depot/projects/smpng/sys/modules/Makefile#116 integrate .. //depot/projects/smpng/sys/modules/arcnet/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/dummynet/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/firewire/firewire/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/nfs4client/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/twa/Makefile#5 integrate .. //depot/projects/smpng/sys/net/if.c#79 integrate .. //depot/projects/smpng/sys/net/if.h#29 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#24 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#71 integrate .. //depot/projects/smpng/sys/net/if_gre.c#29 integrate .. //depot/projects/smpng/sys/net/if_media.c#8 integrate .. //depot/projects/smpng/sys/net/if_media.h#16 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#45 integrate .. //depot/projects/smpng/sys/net/pfil.c#10 integrate .. //depot/projects/smpng/sys/net/pfil.h#9 integrate .. //depot/projects/smpng/sys/net/radix.c#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#19 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#29 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#59 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#43 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#21 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#33 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#68 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#76 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#83 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#14 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#80 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#16 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#76 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#46 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#40 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#31 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#13 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#16 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#45 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#31 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#35 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/smpng/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#7 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#51 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#22 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#39 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#64 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#43 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#59 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#55 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#44 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#44 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#38 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#67 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#48 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit.h#1 branch .. //depot/projects/smpng/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_private.h#1 branch .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#78 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#64 integrate .. //depot/projects/smpng/sys/sys/imgact.h#13 integrate .. //depot/projects/smpng/sys/sys/ipmi.h#1 branch .. //depot/projects/smpng/sys/sys/mbuf.h#60 integrate .. //depot/projects/smpng/sys/sys/mount.h#49 integrate .. //depot/projects/smpng/sys/sys/namei.h#18 integrate .. //depot/projects/smpng/sys/sys/param.h#97 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#15 integrate .. //depot/projects/smpng/sys/sys/proc.h#162 integrate .. //depot/projects/smpng/sys/sys/ptrace.h#16 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#7 integrate .. //depot/projects/smpng/sys/sys/sockio.h#10 integrate .. //depot/projects/smpng/sys/sys/syscall.h#65 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#65 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#25 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#37 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#67 integrate .. //depot/projects/smpng/sys/sys/systm.h#70 integrate .. //depot/projects/smpng/sys/sys/thr.h#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#31 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#63 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#78 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#72 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#57 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#57 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#83 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -250,7 +250,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); - realmem = alpha_ptob(Maxmem); + realmem = Maxmem; /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.58 2006/02/07 21:22:01 phk Exp $"); #include "opt_kstack_pages.h" @@ -225,7 +225,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#64 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -259,7 +259,6 @@ register struct proc *p; register int i; u_int64_t ucode; - u_int sticks; int user; #ifdef SMP register_t s; @@ -302,12 +301,11 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); } else { - sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); } @@ -599,7 +597,7 @@ out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); - userret(td, framep, sticks); + userret(td, framep); mtx_assert(&Giant, MA_NOTOWNED); } return; @@ -636,7 +634,6 @@ struct proc *p; int error = 0; u_int64_t opc; - u_int sticks; u_int64_t args[10]; /* XXX */ u_int hidden = 0, nargs; #ifdef SMP @@ -668,7 +665,7 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) @@ -777,7 +774,7 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - userret(td, framep, sticks); + userret(td, framep); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/smpng/sys/alpha/linux/linux_proto.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #include @@ -21,156 +21,156 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 39 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_SIGPROCMASK }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_SIGPENDING }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 57 = linux_symlink */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 58 = linux_readlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 63 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_O_GETPAGESIZE }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 66 = linux_vfork */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 67 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_O_VHANGUP }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_SETITIMER }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 92 = linux_fcntl */ + { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_SELECT }, /* 93 = osf1_select */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 94 = poll */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ + { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ + { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ + { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ + { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ + { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_SOCKETPAIR }, /* 135 = linux_socketpair */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 136 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 137 = linux_rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_MSGCTL }, /* 200 = linux_msgctl */ + { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_MSGGET }, /* 201 = linux_msgget */ + { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_MSGRCV }, /* 202 = linux_msgrcv */ + { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_MSGSND }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_SEMCTL }, /* 204 = linux_semctl */ + { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_SEMGET }, /* 205 = linux_semget */ + { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_SEMOP }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 208 = linux_lchown */ + { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_SHMAT }, /* 209 = linux_shmat */ + { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_SHMCTL }, /* 210 = linux_shmctl */ + { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_SHMDT }, /* 211 = linux_shmdt */ + { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_SHMGET }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -253,8 +253,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ @@ -320,57 +320,57 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 300 = linux_bdflush */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 305 = linux_getdents */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 22 18:38: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 D9A1516A423; Wed, 22 Feb 2006 18:38:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B528216A420 for ; Wed, 22 Feb 2006 18:38:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD59743D73 for ; Wed, 22 Feb 2006 18:38:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MIcLxr071636 for ; Wed, 22 Feb 2006 18:38:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MIcL2a071633 for perforce@freebsd.org; Wed, 22 Feb 2006 18:38:21 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 18:38:21 GMT Message-Id: <200602221838.k1MIcL2a071633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92215 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, 22 Feb 2006 18:38:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92215 Change 92215 by jhb@jhb_slimer on 2006/02/22 18:37:51 Remove this XXX. The only time it wouldn't be curthread here is if a multithreaded process was doing a coredump, and in that case td->td_proc == curproc, and we know the process hasn't exited yet, so P_WEXIT isn't set yet. Affected files ... .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#102 edit Differences ... ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#102 (text+ko) ==== @@ -1097,7 +1097,6 @@ r->rnat = (bspst > kstk && (bspst & 0x1ffL) < (kstk & 0x1ffL)) ? *(uint64_t*)(kstk | 0x1f8L) : rnat; } else { - /* XXX: What if P_WEXIT is set? */ PHOLD(td->td_proc); iov.iov_base = (void*)(uintptr_t)kstk; iov.iov_len = r->ndirty; From owner-p4-projects@FreeBSD.ORG Wed Feb 22 18:55:46 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 1B06416A446; Wed, 22 Feb 2006 18:55:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFE2E16A431 for ; Wed, 22 Feb 2006 18:55:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE9D243D69 for ; Wed, 22 Feb 2006 18:55:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MItgEG072547 for ; Wed, 22 Feb 2006 18:55:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MItgxK072544 for perforce@freebsd.org; Wed, 22 Feb 2006 18:55:42 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 18:55:42 GMT Message-Id: <200602221855.k1MItgxK072544@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 92216 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, 22 Feb 2006 18:55:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92216 Change 92216 by imp@imp_Speedy on 2006/02/22 18:55:25 Not yet -> never really since this part doesn't support USB 2.0 really fast speeds, just the 12Mbps FULL SPEED. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#8 (text+ko) ==== @@ -100,9 +100,6 @@ sc->sc_flags |= OHCI_SCFLG_DONEINIT; err = device_probe_and_attach(sc->sc_bus.bdev); } -#ifdef notyet - sc->sc_bus.usbrev = USBREV_2_0; -#endif error:; if (err) { From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19:08:03 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 A5BB816A424; Wed, 22 Feb 2006 19:08:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D8DF16A420 for ; Wed, 22 Feb 2006 19:08:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E274943D78 for ; Wed, 22 Feb 2006 19:07:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJ7wed073408 for ; Wed, 22 Feb 2006 19:07:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJ7wQ5073404 for perforce@freebsd.org; Wed, 22 Feb 2006 19:07:58 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 19:07:58 GMT Message-Id: <200602221907.k1MJ7wQ5073404@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 92218 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, 22 Feb 2006 19:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92218 Change 92218 by imp@imp_Speedy on 2006/02/22 19:07:21 PMC and PIO aren't optional. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91#2 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X#22 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91#2 (text) ==== @@ -8,8 +8,8 @@ arm/at91/uart_dev_at91usart.c optional uart arm/at91/if_ate.c optional ate arm/at91/at91_mci.c optional at91_mci -arm/at91/at91_pio.c optional at91_pio -arm/at91/at91_pmc.c optional at91_pmc +arm/at91/at91_pio.c optional standard +arm/at91/at91_pmc.c optional standard arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi arm/at91/at91_twi.c optional at91_twi ==== //depot/projects/arm/src/sys/arm/conf/KB920X#22 (text+ko) ==== @@ -91,5 +91,3 @@ device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: device at91_ssc -device at91_pio -device at91_pmc From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19:23: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 9555E16A423; Wed, 22 Feb 2006 19:23:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AD9A16A420 for ; Wed, 22 Feb 2006 19:23:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6498943D75 for ; Wed, 22 Feb 2006 19:23:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJNYR9074100 for ; Wed, 22 Feb 2006 19:23:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJNYtq074097 for perforce@freebsd.org; Wed, 22 Feb 2006 19:23:34 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 19:23:34 GMT Message-Id: <200602221923.k1MJNYtq074097@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 92221 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, 22 Feb 2006 19:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92221 Change 92221 by imp@imp_Speedy on 2006/02/22 19:22:33 Now that we have drivers for the PMC and ST, move interrupt disabling for those devices into thsoe drivers. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#9 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#9 edit .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#9 (text+ko) ==== @@ -272,10 +272,6 @@ /* XXX */ /* Disable all interrupts for RTC (0xe24 == RTC_IDR) */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xe24, 0xffffffff); - /* Disable all interrupts for PMC (0xc64 == PMC_IDR) */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xc64, 0xffffffff); - /* Disable all interrupts for ST */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xd18, 0xffffffff); /* DIsable all interrupts for DBGU */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x20c, 0xffffffff); /* Disable all interrupts for PIOA */ @@ -288,6 +284,7 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xa44, 0xffffffff); /* Disable all interrupts for the SDRAM controller */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff); + /* XXX call a function here */ i = 0; at91_add_child(dev, i++, "at91_st", 0, 0, 0, AT91RM92_IRQ_SYSTEM); at91_add_child(dev, i++, "at91_pio", 0, AT91RM92_BASE + // PIOA ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#9 (text+ko) ==== @@ -283,7 +283,10 @@ freq / 1000000, mck.hz / 1000000); WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); + /* XXX -- enable all PMC clocks */ WR4(sc, PMC_PCER, 0xffffffff); + /* Disable all interrupts for PMC */ + WR4(sc, PMC_IDR, 0xffffffff); } static void ==== //depot/projects/arm/src/sys/arm/at91/at91_st.c#4 (text+ko) ==== @@ -102,7 +102,8 @@ * initializing clocks so that DELAY works. */ WR4(ST_RTMR, 1); - + /* Disable all interrupts */ + WR4(ST_IDR, 0xffffffff); return (0); } From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19:23: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 8977116A46B; Wed, 22 Feb 2006 19:23:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C04816A42A for ; Wed, 22 Feb 2006 19:23:37 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D25143D77 for ; Wed, 22 Feb 2006 19:23:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJNYVn074106 for ; Wed, 22 Feb 2006 19:23:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJNYRt074103 for perforce@freebsd.org; Wed, 22 Feb 2006 19:23:34 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 22 Feb 2006 19:23:34 GMT Message-Id: <200602221923.k1MJNYRt074103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92222 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, 22 Feb 2006 19:23:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92222 Change 92222 by kmacy@kmacy_storage:sun4v_work on 2006/02/22 19:22:34 add virtual mappings through ofw so that we can recover them along with other PROM mappings in pmap_bootstrap Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/Makefile#2 edit .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm_mmu.c#1 add .. //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/Makefile#2 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ - ofw_time.c openfirm.c + ofw_time.c openfirm.c openfirm_mmu.c CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.c#2 (text+ko) ==== @@ -87,6 +87,20 @@ panic("failed to get mmu ihandle"); } +phandle_t +OF_chosennode(void) +{ + static phandle_t chosen; + + if (chosen) + return (chosen); + + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + + return (chosen); +} + /* * Generic functions */ ==== //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.h#2 (text+ko) ==== @@ -126,4 +126,12 @@ /* Time function */ int OF_milliseconds(void); + +/* MMU functions */ +int OF_translate_virt(vm_offset_t va, int *valid, vm_paddr_t *physaddr, int *mode); +vm_paddr_t OF_vtophys(vm_offset_t va); +int OF_map_phys(int mode, size_t size, vm_offset_t va, uint64_t pa); + + + #endif /* _OPENFIRM_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -372,9 +372,8 @@ } tlb_store[va >> 22].te_pa = pa; - data = VTD_V | VTD_PA(pa) | VTD_CP | VTD_CV | VTD_P | VTD_W | VTD_4M; - if ((ret = hv_mmu_map_perm_addr(va, 0, data, MAP_DTLB | MAP_ITLB)) != 0) - printf("hv_mmu_map_perm_addr failed: %d\n", ret);; + if ((ret = OF_map_phys(-1, PAGE_SIZE_4M, va, pa)) != 0) + printf("OF_map_phys failed: %d\n", ret); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19: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 5530716A423; Wed, 22 Feb 2006 19:45:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20ED616A420 for ; Wed, 22 Feb 2006 19:45:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E16AA43D45 for ; Wed, 22 Feb 2006 19: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.1/8.13.1) with ESMTP id k1MJj0Mj074884 for ; Wed, 22 Feb 2006 19:45:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJj0bZ074881 for perforce@freebsd.org; Wed, 22 Feb 2006 19:45:00 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 19:45:00 GMT Message-Id: <200602221945.k1MJj0bZ074881@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 92223 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, 22 Feb 2006 19:45:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92223 Change 92223 by imp@imp_Speedy on 2006/02/22 19:44:47 Sort + do standard devices in the right way. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91#3 (text) ==== @@ -3,15 +3,15 @@ arm/arm/irq_dispatch.S standard arm/at91/at91.c standard arm/at91/at91_st.c standard -arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91rm9200usart.c optional uart -arm/at91/uart_dev_at91usart.c optional uart -arm/at91/if_ate.c optional ate arm/at91/at91_mci.c optional at91_mci -arm/at91/at91_pio.c optional standard -arm/at91/at91_pmc.c optional standard +arm/at91/at91_pio.c standard +arm/at91/at91_pmc.c standard arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp +arm/at91/if_ate.c optional ate arm/at91/ohci_atmelarm.c optional ohci +arm/at91/uart_bus_at91usart.c optional uart +arm/at91/uart_cpu_at91rm9200usart.c optional uart +arm/at91/uart_dev_at91usart.c optional uart From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19:46:03 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 1859316A424; Wed, 22 Feb 2006 19:46:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E63DB16A422 for ; Wed, 22 Feb 2006 19:46:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CDA243D45 for ; Wed, 22 Feb 2006 19:46:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJk2oO075034 for ; Wed, 22 Feb 2006 19:46:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJk2Al075031 for perforce@freebsd.org; Wed, 22 Feb 2006 19:46:02 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 19:46:02 GMT Message-Id: <200602221946.k1MJk2Al075031@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 92224 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, 22 Feb 2006 19:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92224 Change 92224 by imp@imp_Speedy on 2006/02/22 19:45:08 PIO register (but not bit) definitions. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#2 (text+ko) ==== @@ -27,4 +27,42 @@ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H +/* Registers */ +#define PIO_PER 0x00 /* PIO Enable Register */ +#define PIO_PDR 0x04 /* PIO Disable Register */ +#define PIO_PSR 0x08 /* PIO Status Register */ + /* 0x0c reserved */ +#define PIO_OER 0x10 /* PIO Output Enable Register */ +#define PIO_ODR 0x14 /* PIO Output Disable Register */ +#define PIO_OSR 0x18 /* PIO Output Status Register */ + /* 0x1c reserved */ +#define PIO_IFER 0x20 /* PIO Glitch Input Enable Register */ +#define PIO_IFDR 0x24 /* PIO Glitch Input Disable Register */ +#define PIO_IFSR 0x28 /* PIO Glitch Input Status Register */ + /* 0x2c reserved */ +#define PIO_SODR 0x30 /* PIO Set Output Data Register */ +#define PIO_CODR 0x34 /* PIO Clear Output Data Register */ +#define PIO_ODSR 0x38 /* PIO Output Data Status Register */ +#define PIO_PDSR 0x3c /* PIO Pin Data Status Register */ +#define PIO_IER 0x40 /* PIO Interrupt Enable Register */ +#define PIO_IDR 0x44 /* PIO Interrupt Disable Register */ +#define PIO_IMR 0x48 /* PIO Interrupt Mask Register */ +#define PIO_ISR 0x4c /* PIO Interrupt Status Register */ +#define PIO_MDER 0x50 /* PIO Multi-Driver Enable Register */ +#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_PUSR 0x68 /* PIO Pull-up Status Register */ + /* 0x6c reserved */ +#define PIO_ASR 0x70 /* PIO Peripheral A Select Register */ +#define PIO_BSR 0x74 /* PIO Peripheral B Select Register */ +#define PIO_ABSR 0x78 /* PIO AB Status Register */ + /* 0x7c-0x9c reserved */ +#define PIO_OWER 0xa0 /* PIO Output Write Enable Register */ +#define PIO_OWDR 0xa4 /* PIO Output Write Disable Register */ +#define PIO_OWSR 0xa8 /* PIO Output Write Status Register */ + /* 0xac reserved */ + #endif /* ARM_AT91_AT91_PIOREG_H */ From owner-p4-projects@FreeBSD.ORG Wed Feb 22 19:46:04 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 A052516A432; Wed, 22 Feb 2006 19:46:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CF0B16A42A for ; Wed, 22 Feb 2006 19:46:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAC0643D46 for ; Wed, 22 Feb 2006 19:46:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJk2JV075040 for ; Wed, 22 Feb 2006 19:46:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJk2xv075037 for perforce@freebsd.org; Wed, 22 Feb 2006 19:46:02 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 19:46:02 GMT Message-Id: <200602221946.k1MJk2xv075037@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 92225 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, 22 Feb 2006 19:46:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92225 Change 92225 by imp@imp_Speedy on 2006/02/22 19:45:34 Disable interrupts in pio attachment. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#10 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#10 (text+ko) ==== @@ -274,14 +274,6 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xe24, 0xffffffff); /* DIsable all interrupts for DBGU */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x20c, 0xffffffff); - /* Disable all interrupts for PIOA */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x444, 0xffffffff); - /* Disable all interrupts for PIOB */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x644, 0xffffffff); - /* Disable all interrupts for PIOC */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x844, 0xffffffff); - /* Disable all interrupts for PIOD */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xa44, 0xffffffff); /* Disable all interrupts for the SDRAM controller */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff); /* XXX call a function here */ ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#4 (text+ko) ==== @@ -121,8 +121,9 @@ AT91_PIO_LOCK_INIT(sc); /* - * Activate the interrupt + * Activate the interrupt, but disable all interrupts in the hardware */ + WR4(sc, PIO_IDR, 0xffffffff); err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, at91_pio_intr, sc, &sc->intrhand); if (err) { From owner-p4-projects@FreeBSD.ORG Wed Feb 22 20:47:20 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 95FF816A423; Wed, 22 Feb 2006 20:47:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 556EA16A420 for ; Wed, 22 Feb 2006 20:47:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1359743D45 for ; Wed, 22 Feb 2006 20:47:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MKlIJ9085387 for ; Wed, 22 Feb 2006 20:47:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MKlIUA085384 for perforce@freebsd.org; Wed, 22 Feb 2006 20:47:18 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 20:47:18 GMT Message-Id: <200602222047.k1MKlIUA085384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92228 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, 22 Feb 2006 20:47:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92228 Change 92228 by jhb@jhb_slimer on 2006/02/22 20:46:39 IFC @92227 (Loopback). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#84 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#65 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#11 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#45 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#113 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#31 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#54 integrate .. //depot/projects/smpng/sys/sys/proc.h#163 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#84 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.238 2006/02/22 18:57:48 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#65 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.129 2006/02/22 18:57:49 jhb Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/arm/arm/machdep.c#18 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.20 2005/11/24 08:16:17 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.21 2006/02/22 18:57:49 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/arm/arm/undefined.c#11 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.10 2006/02/03 06:27:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#45 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.58 2006/02/22 17:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.59 2006/02/22 18:57:49 jhb Exp $"); #include "opt_pseudofs.h" ==== //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.16 2005/07/02 20:06:44 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.17 2006/02/22 18:57:49 jhb Exp $"); #include "opt_cpu.h" ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#103 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.206 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.207 2006/02/22 18:57:49 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_exit.c#113 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.284 2006/02/21 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.285 2006/02/22 18:57:49 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_kse.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.222 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.223 2006/02/22 18:57:49 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/kern/sys_process.c#54 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.136 2006/02/14 01:18:31 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.137 2006/02/22 18:57:50 jhb Exp $"); #include "opt_compat.h" ==== //depot/projects/smpng/sys/sys/proc.h#163 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.453 2006/02/15 23:52:00 davidxu Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.454 2006/02/22 18:57:50 jhb Exp $ */ #ifndef _SYS_PROC_H_ From owner-p4-projects@FreeBSD.ORG Wed Feb 22 20:48:21 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 4078316A424; Wed, 22 Feb 2006 20:48:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19D2016A422 for ; Wed, 22 Feb 2006 20:48:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C572343D45 for ; Wed, 22 Feb 2006 20:48:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MKmK5s085426 for ; Wed, 22 Feb 2006 20:48:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MKmK2v085423 for perforce@freebsd.org; Wed, 22 Feb 2006 20:48:20 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 20:48:20 GMT Message-Id: <200602222048.k1MKmK2v085423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92229 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, 22 Feb 2006 20:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=92229 Change 92229 by jhb@jhb_slimer on 2006/02/22 20:47:24 IFC @92227 again. With feeling this time. Affected files ... .. //depot/projects/smpng/sys/modules/pflog/Makefile#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 22 21: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 31EA616A423; Wed, 22 Feb 2006 21:18:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E410E16A420 for ; Wed, 22 Feb 2006 21:18:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D68343D48 for ; Wed, 22 Feb 2006 21:18:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MLIFWW086690 for ; Wed, 22 Feb 2006 21:18:15 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MLIFJW086687 for perforce@freebsd.org; Wed, 22 Feb 2006 21:18:15 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 21:18:15 GMT Message-Id: <200602222118.k1MLIFJW086687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92231 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, 22 Feb 2006 21:18:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92231 Change 92231 by jhb@jhb_slimer on 2006/02/22 21:17:47 Minor nits, axe an extra int we didn't need, and expand some comments. Affected files ... .. //depot/projects/smpng/sys/kern/kern_timeout.c#28 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_timeout.c#28 (text+ko) ==== @@ -78,8 +78,8 @@ /** * Locked by callout_lock: * curr_callout - If a callout is in progress, it is curr_callout. - * If curr_callout is non-NULL, threads waiting on - * callout_wait will be woken up as soon as the + * If curr_callout is non-NULL, threads waiting in + * callout_drain() will be woken up as soon as the * relevant callout completes. * curr_cancelled - Changing to 1 with both callout_lock and c_mtx held * guarantees that the current callout will not run. @@ -87,14 +87,12 @@ * drops callout_lock to acquire c_mtx, and it calls * the handler only if curr_cancelled is still 0 after * c_mtx is successfully acquired. - * wakeup_needed - If a thread is waiting on callout_wait, then - * wakeup_needed is nonzero. Set only when + * callout_wait - If a thread is waiting in callout_drain(), then + * callout_wait is nonzero. Set only when * curr_callout is non-NULL. - * callout_wait - Placeholder for a wait channel. */ static struct callout *curr_callout; static int curr_cancelled; -static int wakeup_needed; static int callout_wait; /* @@ -246,8 +244,7 @@ */ if (curr_cancelled) { mtx_unlock(c_mtx); - mtx_lock_spin(&callout_lock); - goto done_locked; + goto skip; } /* The callout cannot be stopped now. */ curr_cancelled = 1; @@ -292,16 +289,16 @@ #endif if ((c_flags & CALLOUT_RETURNUNLOCKED) == 0) mtx_unlock(c_mtx); + skip: mtx_lock_spin(&callout_lock); -done_locked: curr_callout = NULL; - if (wakeup_needed) { + if (callout_wait) { /* - * There might be someone waiting + * There is someone waiting * for the callout to complete. */ wakeup(&callout_wait); - wakeup_needed = 0; + callout_wait = 0; } steps = 0; c = nextsoftcheck; @@ -423,7 +420,7 @@ */ if (c->c_mtx != NULL && !curr_cancelled) cancelled = curr_cancelled = 1; - if (wakeup_needed) { + if (callout_wait) { /* * Someone has called callout_drain to kill this * callout. Don't reschedule. @@ -490,24 +487,38 @@ mtx_lock_spin(&callout_lock); /* - * Don't attempt to delete a callout that's not on the queue. + * If the callout isn't pending, it's not on the queue, so + * don't attempt to remove it from the queue. We can try + * to stop it by other means however. */ if (!(c->c_flags & CALLOUT_PENDING)) { c->c_flags &= ~CALLOUT_ACTIVE; - if (c != curr_callout) { - mtx_unlock_spin(&callout_lock); - return (0); - } - rval = 0; - if (safe) { - /* We need to wait until the callout is finished. */ + + /* + * If it wasn't on the queue and it isn't the current + * callout, then we can't stop it, so just bail. + */ + if (c != curr_callout) + rval = 0; + else if (safe) { + /* + * The current callout is running (or just about to + * run) and blocking is allowed, so just wait for + * the current invocation to finish. + */ while (c == curr_callout) { - wakeup_needed = 1; + callout_wait = 1; msleep_spin(&callout_wait, &callout_lock, - "costop", 0); + "codrain", 0); } + rval = 0; } else if (use_mtx && !curr_cancelled) { - /* We can stop the callout before it runs. */ + /* + * The current callout is waiting for it's mutex + * which we hold. Cancel the callout and return. + * After our caller drops the mutex, the callout + * will be skipped in softclock(). + */ curr_cancelled = 1; rval = 1; } From owner-p4-projects@FreeBSD.ORG Wed Feb 22 21:40:44 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 C433516A423; Wed, 22 Feb 2006 21:40:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A8BD16A420 for ; Wed, 22 Feb 2006 21:40:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4748A43D45 for ; Wed, 22 Feb 2006 21:40:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MLeh22087723 for ; Wed, 22 Feb 2006 21:40:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MLegeu087720 for perforce@freebsd.org; Wed, 22 Feb 2006 21:40:42 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 21:40:42 GMT Message-Id: <200602222140.k1MLegeu087720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92235 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, 22 Feb 2006 21:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92235 Change 92235 by jhb@jhb_slimer on 2006/02/22 21:40:30 Feh. Affected files ... .. //depot/projects/smpng/sys/kern/kern_timeout.c#29 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_timeout.c#29 (text+ko) ==== @@ -472,7 +472,7 @@ struct callout *c; int safe; { - int rval, use_mtx; + int use_mtx; if (!safe && c->c_mtx != NULL) { #ifdef notyet /* Some callers do not hold Giant for Giant-locked callouts. */ @@ -488,8 +488,8 @@ mtx_lock_spin(&callout_lock); /* * If the callout isn't pending, it's not on the queue, so - * don't attempt to remove it from the queue. We can try - * to stop it by other means however. + * don't attempt to remove it from the queue. We can try to + * stop it by other means however. */ if (!(c->c_flags & CALLOUT_PENDING)) { c->c_flags &= ~CALLOUT_ACTIVE; @@ -498,32 +498,37 @@ * If it wasn't on the queue and it isn't the current * callout, then we can't stop it, so just bail. */ - if (c != curr_callout) - rval = 0; - else if (safe) { + if (c != curr_callout) { + mtx_unlock_spin(&callout_lock); + return (0); + } + + if (safe) { /* - * The current callout is running (or just about to - * run) and blocking is allowed, so just wait for - * the current invocation to finish. + * The current callout is running (or just + * about to run) and blocking is allowed, so + * just wait for the current invocation to + * finish. */ while (c == curr_callout) { callout_wait = 1; msleep_spin(&callout_wait, &callout_lock, "codrain", 0); } - rval = 0; } else if (use_mtx && !curr_cancelled) { /* - * The current callout is waiting for it's mutex - * which we hold. Cancel the callout and return. - * After our caller drops the mutex, the callout - * will be skipped in softclock(). + * The current callout is waiting for it's + * mutex which we hold. Cancel the callout + * and return. After our caller drops the + * mutex, the callout will be skipped in + * softclock(). */ curr_cancelled = 1; - rval = 1; + mtx_unlock_spin(&callout_lock); + return (1); } mtx_unlock_spin(&callout_lock); - return (rval); + return (0); } c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING); From owner-p4-projects@FreeBSD.ORG Wed Feb 22 21:48:25 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 3B4DD16A423; Wed, 22 Feb 2006 21:48:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1499416A420 for ; Wed, 22 Feb 2006 21:48:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6625B43D6A for ; Wed, 22 Feb 2006 21:48:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MLmNlM088196 for ; Wed, 22 Feb 2006 21:48:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MLmN8p088193 for perforce@freebsd.org; Wed, 22 Feb 2006 21:48:23 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Feb 2006 21:48:23 GMT Message-Id: <200602222148.k1MLmN8p088193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92238 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, 22 Feb 2006 21:48:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92238 Change 92238 by jhb@jhb_twclab on 2006/02/22 21:47:59 Compile. Affected files ... .. //depot/projects/smpng/sys/dev/ppc/ppc.c#9 edit Differences ... ==== //depot/projects/smpng/sys/dev/ppc/ppc.c#9 (text+ko) ==== @@ -1969,7 +1969,6 @@ struct ppc_data *ppc = DEVTOSOFTC(dev); device_t ppbus; - device_t parent = device_get_parent(dev); device_printf(dev, "%s chipset (%s) in %s mode%s\n", ppc_models[ppc->ppc_model], ppc_avms[ppc->ppc_avm], From owner-p4-projects@FreeBSD.ORG Wed Feb 22 23:59:14 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 B786A16A424; Wed, 22 Feb 2006 23:59:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C85F16A420 for ; Wed, 22 Feb 2006 23:59:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAEEC43D45 for ; Wed, 22 Feb 2006 23:59:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MNxCFP094489 for ; Wed, 22 Feb 2006 23:59:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MNxCWr094486 for perforce@freebsd.org; Wed, 22 Feb 2006 23:59:12 GMT (envelope-from imp@freebsd.org) Date: Wed, 22 Feb 2006 23:59:12 GMT Message-Id: <200602222359.k1MNxCWr094486@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 92244 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, 22 Feb 2006 23:59:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92244 Change 92244 by imp@imp_Speedy on 2006/02/22 23:59:07 Table driven device list. This will allow us to port to other members of the AT91 family that are ARM9 a little more easily. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#11 (text+ko) ==== @@ -195,7 +195,7 @@ static void at91_add_child(device_t dev, int prio, const char *name, int unit, - bus_addr_t addr, bus_size_t size, int irq) + bus_addr_t addr, bus_size_t size, int irq0, int irq1, int irq2) { device_t kid; struct at91_ivar *ivar; @@ -210,12 +210,175 @@ } device_set_ivars(kid, ivar); resource_list_init(&ivar->resources); - if (irq != -1) - bus_set_resource(kid, SYS_RES_IRQ, 0, irq, 1); + if (irq0 != -1) + bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); + if (irq1 != 0) + bus_set_resource(kid, SYS_RES_IRQ, 1, irq1, 1); + if (irq2 != 0) + bus_set_resource(kid, SYS_RES_IRQ, 2, irq2, 1); if (addr != 0) bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size); } +struct cpu_devs +{ + const char *name; + int unit; + bus_addr_t mem_base; + bus_size_t mem_len; + int irq0; + int irq1; + int irq2; +}; + +struct cpu_devs at91rm9200_devs[] = +{ + // All the "system" devices + { + "at91_st", 0, + AT91RM92_BASE + AT91RM92_ST_BASE, AT91RM92_ST_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_pio", 0, + AT91RM92_BASE + AT91RM92_PIOA_BASE, AT91RM92_PIO_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_pio", 1, + AT91RM92_BASE + AT91RM92_PIOB_BASE, AT91RM92_PIO_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_pio", 2, + AT91RM92_BASE + AT91RM92_PIOC_BASE, AT91RM92_PIO_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_pio", 3, + AT91RM92_BASE + AT91RM92_PIOD_BASE, AT91RM92_PIO_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_pmc", 0, + AT91RM92_BASE + AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_aic", 0, + AT91RM92_BASE + AT91RM92_AIC_BASE, AT91RM92_AIC_SIZE, + 0 // Interrupt controller has no interrupts! + }, + { + "at91_rtc", 0, + AT91RM92_BASE + AT91RM92_RTC_BASE, AT91RM92_RTC_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "at91_mc", 0, + AT91RM92_BASE + AT91RM92_MC_BASE, AT91RM92_MC_SIZE, + AT91RM92_IRQ_SYSTEM + }, + + // All other devices + { + "at91_tc", 0, + AT91RM92_BASE + AT91RM92_TC0_BASE, AT91RM92_TC_SIZE, + AT91RM92_IRQ_TC0, AT91RM92_IRQ_TC1, AT91RM92_IRQ_TC2 + }, + { + "at91_tc", 1, + AT91RM92_BASE + AT91RM92_TC1_BASE, AT91RM92_TC_SIZE, + AT91RM92_IRQ_TC3, AT91RM92_IRQ_TC4, AT91RM92_IRQ_TC5 + }, + { + "at91_udp", 0, + AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, + AT91RM92_IRQ_UDP + }, + { + "at91_mci", 0, + AT91RM92_BASE + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, + AT91RM92_IRQ_MCI + }, + { + "at91_twi", 0, + AT91RM92_BASE + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, + AT91RM92_IRQ_TWI + }, + { + "ate", 0, + AT91RM92_BASE + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, + AT91RM92_IRQ_EMAC + }, + { + "uart", 0, + AT91RM92_BASE + AT91RM92_DBGU_BASE, AT91RM92_DBGU_SIZE, + AT91RM92_IRQ_SYSTEM + }, + { + "uart", 1, + AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, + AT91RM92_IRQ_USART0 + }, + { + "uart", 2, + AT91RM92_BASE + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, + AT91RM92_IRQ_USART1 + }, + { + "uart", 3, + AT91RM92_BASE + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, + AT91RM92_IRQ_USART2 + }, + { + "uart", 4, + AT91RM92_BASE + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, + AT91RM92_IRQ_USART3 + }, + { + "at91_ssc", 0, + AT91RM92_BASE + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, + AT91RM92_IRQ_SSC0 + }, + { + "at91_ssc", 1, + AT91RM92_BASE + AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, + AT91RM92_IRQ_SSC1 + }, + { + "at91_ssc", 2, + AT91RM92_BASE + AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, + AT91RM92_IRQ_SSC2 + }, + { + "at91_spi", 0, + AT91RM92_BASE + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, + AT91RM92_IRQ_SPI + }, + { + "ohci", 0, + AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, + AT91RM92_IRQ_UHP + }, + { 0, 0, 0, 0, 0 } +}; + +static void +at91_cpu_add_builtin_children(device_t dev, struct at91_softc *sc) +{ + int i; + struct cpu_devs *walker; + + // XXX should look at the device id in the DBGU register and + // XXX based on the CPU load in these devices + for (i = 0, walker = at91rm9200_devs; walker->name; i++, walker++) { + at91_add_child(dev, i, walker->name, walker->unit, + walker->mem_base, walker->mem_len, walker->irq0, + walker->irq1, walker->irq2); + } +} + #define NORMDEV 50 static int @@ -276,48 +439,9 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x20c, 0xffffffff); /* Disable all interrupts for the SDRAM controller */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff); - /* XXX call a function here */ - i = 0; - at91_add_child(dev, i++, "at91_st", 0, 0, 0, AT91RM92_IRQ_SYSTEM); - at91_add_child(dev, i++, "at91_pio", 0, AT91RM92_BASE + // PIOA - AT91RM92_PIOA_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, i++, "at91_pio", 1, AT91RM92_BASE + // PIOB - AT91RM92_PIOB_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, i++, "at91_pio", 2, AT91RM92_BASE + // PIOC - AT91RM92_PIOC_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, i++, "at91_pio", 3, AT91RM92_BASE + // PIOD - AT91RM92_PIOD_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, i++, "at91_pmc", 0, AT91RM92_BASE + // PMC - AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, 1); - at91_add_child(dev, NORMDEV, "at91_udp", 0, AT91RM92_BASE + // UDP - AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); - at91_add_child(dev, NORMDEV, "at91_mci", 0, AT91RM92_BASE + // MCI - AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); - at91_add_child(dev, NORMDEV, "at91_twi", 0, AT91RM92_BASE + // TWI - AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); - at91_add_child(dev, NORMDEV, "ate", 0, AT91RM92_BASE + // EMAC - AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); - at91_add_child(dev, NORMDEV, "uart", 0, AT91RM92_BASE + // DBGU - AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, AT91RM92_IRQ_SYSTEM); - at91_add_child(dev, NORMDEV, "uart", 1, AT91RM92_BASE + // USART0 - AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART0); - at91_add_child(dev, NORMDEV, "uart", 2, AT91RM92_BASE + // USART1 - AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART1); - at91_add_child(dev, NORMDEV, "uart", 3, AT91RM92_BASE + // USART2 - AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); - at91_add_child(dev, NORMDEV, "uart", 4, AT91RM92_BASE + // USART3 - AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); - at91_add_child(dev, NORMDEV, "at91_ssc", 0, AT91RM92_BASE + // SSC0 - AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); - at91_add_child(dev, NORMDEV, "at91_ssc", 1, AT91RM92_BASE + // SSC1 - AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); - at91_add_child(dev, NORMDEV, "at91_ssc", 2, AT91RM92_BASE + // SSC2 - AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); - at91_add_child(dev, NORMDEV, "at91_spi", 0, AT91RM92_BASE + // SPI - AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); - // Not sure that the following belongs on this bus. - at91_add_child(dev, NORMDEV, "ohci", 0, // UHP - AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP); + + at91_cpu_add_builtin_children(dev, sc); + bus_generic_probe(dev); bus_generic_attach(dev); enable_interrupts(I32_bit | F32_bit); ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#16 (text+ko) ==== @@ -207,13 +207,10 @@ * PIO */ #define AT91RM92_PIOA_BASE 0xffff400 -#define AT91RM92_PIOA_SIZE 0x200 +#define AT91RM92_PIO_SIZE 0x200 #define AT91RM92_PIOB_BASE 0xffff600 -#define AT91RM92_PIOB_SIZE 0x200 #define AT91RM92_PIOC_BASE 0xffff800 -#define AT91RM92_PIOC_SIZE 0x200 #define AT91RM92_PIOD_BASE 0xffffa00 -#define AT91RM92_PIOD_SIZE 0x200 /* * PMC @@ -285,6 +282,18 @@ /* Timer */ +#define AT91RM92_AIC_BASE 0xffff000 +#define AT91RM92_AIC_SIZE 0x200 + +#define AT91RM92_DBGU_BASE 0xffff200 +#define AT91RM92_DBGU_SIZE 0x200 + +#define AT91RM92_RTC_BASE 0xffffe00 +#define AT91RM92_RTC_SIZE 0x100 + +#define AT91RM92_MC_BASE 0xfffff00 +#define AT91RM92_MC_SIZE 0x100 + #define AT91RM92_ST_BASE 0xffffd00 #define AT91RM92_ST_SIZE 0x100 @@ -317,13 +326,12 @@ #define AT91RM92_UDP_SIZE 0x4000 #define AT91RM92_TC0_BASE 0xffa0000 -#define AT91RM92_TC0_SIZE 0x4000 +#define AT91RM92_TC_SIZE 0x4000 #define AT91RM92_TC0C0_BASE 0xffa0000 #define AT91RM92_TC0C1_BASE 0xffa0040 #define AT91RM92_TC0C2_BASE 0xffa0080 #define AT91RM92_TC1_BASE 0xffa4000 -#define AT91RM92_TC1_SIZE 0x4000 #define AT91RM92_TC1C0_BASE 0xffa4000 #define AT91RM92_TC1C1_BASE 0xffa4040 #define AT91RM92_TC1C2_BASE 0xffa4080 From owner-p4-projects@FreeBSD.ORG Thu Feb 23 05:49: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 0103D16A423; Thu, 23 Feb 2006 05:49:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE4E916A420 for ; Thu, 23 Feb 2006 05:49:15 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FFD443D46 for ; Thu, 23 Feb 2006 05:49:15 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1N5nFmF024836 for ; Thu, 23 Feb 2006 05:49:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1N5nFlK024833 for perforce@freebsd.org; Thu, 23 Feb 2006 05:49:15 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 23 Feb 2006 05:49:15 GMT Message-Id: <200602230549.k1N5nFlK024833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92251 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, 23 Feb 2006 05:49:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92251 Change 92251 by kmacy@kmacy:freebsd7_xen3 on 2006/02/23 05:48:15 apply fix submitted by Tim Kuik to xenbus_client.t apply fix for problem discovered by Arun Sharma Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_client.c#3 edit .. //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#4 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_client.c#3 (text+ko) ==== @@ -218,7 +218,7 @@ int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn) { int err = gnttab_grant_foreign_access(dev->otherend_id, ring_mfn, 0); - if (err != 0) + if (err < 0) xenbus_dev_fatal(dev, err, "granting access to ring page"); return err; } ==== //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#4 (text+ko) ==== @@ -183,7 +183,7 @@ #ifndef XEN PCPU_GET(fsgs_gdt)[0] = sd; #else - sd.sd_lolimit = 0x0; /* < 4GB limit */ + sd.sd_lolimit = 0xc3f0; /* < 4GB limit */ HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), *(uint64_t *)&sd); #endif @@ -220,7 +220,7 @@ #ifndef XEN PCPU_GET(fsgs_gdt)[1] = sd; #else - sd.sd_lolimit = 0x0; /* 4GB limit, wraps around */ + sd.sd_lolimit = 0xc3f0; /* 4GB limit, wraps around */ HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), *(uint64_t *)&sd); #endif From owner-p4-projects@FreeBSD.ORG Thu Feb 23 08:45: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 10FE816A423; Thu, 23 Feb 2006 08:45:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE72616A420 for ; Thu, 23 Feb 2006 08:45:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 223DD43D70 for ; Thu, 23 Feb 2006 08:45:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1N8jAHj032052 for ; Thu, 23 Feb 2006 08:45:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1N8j9iI032049 for perforce@freebsd.org; Thu, 23 Feb 2006 08:45:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 08:45:09 GMT Message-Id: <200602230845.k1N8j9iI032049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92257 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, 23 Feb 2006 08:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92257 Change 92257 by rwatson@rwatson_fledge on 2006/02/23 08:44:58 Slight work tweakage. Put OpenBSM 1.0 alpha 4 tarball up for download. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#4 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#3 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#4 $ @@ -54,12 +54,12 @@ systems, such as Mach task interfaces, sendfile(), and Linux system calls present in the FreeBSD Linux emulation layer.

    -

    OpenBSM includes system include files appropriate for inclusion in - an operating system implementation of Audit, libbsm, an - implementation of the BSM library interfaces for generating, parsing, - and managing audit records, auditreduce and praudit, audit reduction - and printing tools, API documentation, and sample /etc configuration - files. +

    The OpenBSM distribution includes system include files appropriate + for inclusion in an operating system implementation of Audit, libbsm, + an implementation of the BSM library interfaces for generating, + parsing, and managing audit records, auditreduce and praudit, audit + reduction and printing tools, API documentation, and sample /etc + configuration files. Works in progress include extensions to the libbsm API to support easier audit trail analysis, including a pattern matching library.

    @@ -76,6 +76,11 @@ Apple under a BSD license. The Darwin BSM implementation was created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

    + +

    2006-02-23 - OpenBSM 1.0 alpha 4 release is an initial test release + of the OpenBSM code base, and matches what is present in FreeBSD CVS + at this date. Download. +

    From owner-p4-projects@FreeBSD.ORG Thu Feb 23 17:21: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 DC4B216A423; Thu, 23 Feb 2006 17:21:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9776F16A420 for ; Thu, 23 Feb 2006 17:21:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41AD543D46 for ; Thu, 23 Feb 2006 17:21:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NHLk2Q010179 for ; Thu, 23 Feb 2006 17:21:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NHLjT5010176 for perforce@freebsd.org; Thu, 23 Feb 2006 17:21:45 GMT (envelope-from marcel@freebsd.org) Date: Thu, 23 Feb 2006 17:21:45 GMT Message-Id: <200602231721.k1NHLjT5010176@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 92272 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, 23 Feb 2006 17:21:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92272 Change 92272 by marcel@marcel_nfs on 2006/02/23 17:21:00 IFC @92269 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#17 integrate .. //depot/projects/uart/alpha/alpha/trap.c#9 integrate .. //depot/projects/uart/arm/arm/machdep.c#8 integrate .. //depot/projects/uart/arm/arm/undefined.c#9 integrate .. //depot/projects/uart/dev/ar/if_ar.c#8 integrate .. //depot/projects/uart/dev/mse/mse.c#4 integrate .. //depot/projects/uart/dev/pcf/envctrl.c#3 integrate .. //depot/projects/uart/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/uart/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/uart/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/uart/dev/ppbus/lpt.c#7 integrate .. //depot/projects/uart/dev/ppbus/ppi.c#5 integrate .. //depot/projects/uart/dev/ppc/ppc.c#7 integrate .. //depot/projects/uart/dev/sio/sio.c#15 integrate .. //depot/projects/uart/dev/sr/if_sr.c#8 integrate .. //depot/projects/uart/dev/uart/uart_core.c#42 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#12 integrate .. //depot/projects/uart/i386/include/mptable.h#3 integrate .. //depot/projects/uart/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#25 integrate .. //depot/projects/uart/kern/kern_condvar.c#6 integrate .. //depot/projects/uart/kern/kern_exit.c#12 integrate .. //depot/projects/uart/kern/kern_kse.c#11 integrate .. //depot/projects/uart/kern/kern_sig.c#24 integrate .. //depot/projects/uart/kern/kern_synch.c#14 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/uart/kern/sys_process.c#14 integrate .. //depot/projects/uart/kern/vfs_subr.c#21 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#20 integrate .. //depot/projects/uart/modules/Makefile#25 integrate .. //depot/projects/uart/pc98/cbus/fdc.c#3 integrate .. //depot/projects/uart/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/uart/pc98/cbus/ppc.c#3 integrate .. //depot/projects/uart/pc98/cbus/sio.c#4 integrate .. //depot/projects/uart/sys/proc.h#19 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#17 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.238 2006/02/22 18:57:48 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1756,6 +1756,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1773,6 +1775,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1836,6 +1840,8 @@ static int ptrace_clear_bpt(struct thread *td, struct mdbpt *bpt) { + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); return ptrace_write_int(td, bpt->addr, bpt->contents); } @@ -1844,6 +1850,8 @@ { int error; u_int32_t bpins = 0x00000080; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); error = ptrace_read_int(td, bpt->addr, &bpt->contents); if (error) return error; @@ -1853,12 +1861,20 @@ int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); if (td->td_md.md_flags & MDTD_STEP2) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP2; } else if (td->td_md.md_flags & MDTD_STEP1) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP1; } return 0; @@ -1867,6 +1883,7 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; vm_offset_t pc = td->td_frame->tf_regs[FRAME_PC]; alpha_instruction ins; @@ -1876,9 +1893,11 @@ if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, pc, &ins.bits); if (error) - return (error); + goto out; switch (ins.branch_format.opcode) { @@ -1918,18 +1937,20 @@ td->td_md.md_sstep[0].addr = addr[0]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]); if (error) - return (error); + goto out; if (count == 2) { td->td_md.md_sstep[1].addr = addr[1]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]); if (error) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - return (error); + goto out; } td->td_md.md_flags |= MDTD_STEP2; } else td->td_md.md_flags |= MDTD_STEP1; +out: + PROC_LOCK(p); return (error); } ==== //depot/projects/uart/alpha/alpha/trap.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.129 2006/02/22 18:57:49 jhb Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -403,8 +403,12 @@ case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); + PROC_LOCK(p); + _PHOLD(p); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; + _PRELE(p); + PROC_UNLOCK(p); mtx_unlock(&Giant); } ucode = a0; /* trap type */ ==== //depot/projects/uart/arm/arm/machdep.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.20 2005/11/24 08:16:17 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.21 2006/02/22 18:57:49 jhb Exp $"); #include #include @@ -327,6 +327,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -344,6 +346,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -359,28 +363,38 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; KASSERT(td->td_md.md_ptrace_instr == 0, ("Didn't clear single step")); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, td->td_frame->tf_pc + 4, &td->td_md.md_ptrace_instr); if (error) - return (error); + goto out; error = ptrace_write_int(td, td->td_frame->tf_pc + 4, PTRACE_BREAKPOINT); if (error) td->td_md.md_ptrace_instr = 0; td->td_md.md_ptrace_addr = td->td_frame->tf_pc + 4; +out: + PROC_LOCK(p); return (error); } int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + if (td->td_md.md_ptrace_instr) { + p = td->td_proc; + PROC_UNLOCK(p); ptrace_write_int(td, td->td_md.md_ptrace_addr, td->td_md.md_ptrace_instr); + PROC_LOCK(p); td->td_md.md_ptrace_instr = 0; } return (0); ==== //depot/projects/uart/arm/arm/undefined.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.10 2006/02/03 06:27:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); #include #include @@ -261,7 +261,11 @@ break; if (fault_code & FAULT_USER && fault_instruction == PTRACE_BREAKPOINT) { + PROC_LOCK(td->td_proc); + _PHOLD(td->td_proc); ptrace_clear_single_step(td); + _PRELE(td->td_proc); + PROC_UNLOCK(td->td_proc); return; } ==== //depot/projects/uart/dev/ar/if_ar.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.72 2005/08/09 10:19:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.73 2006/02/22 18:16:24 jhb Exp $"); /* * Programming assumptions and other issues. @@ -258,7 +258,7 @@ arc_init(hc); - if(BUS_SETUP_INTR(device_get_parent(device), device, hc->res_irq, + if(bus_setup_intr(device, hc->res_irq, INTR_TYPE_NET, arintr, hc, &hc->intr_cookie) != 0) return (1); @@ -285,7 +285,7 @@ #ifndef NETGRAPH ifp = SC2IFP(sc) = if_alloc(IFT_PPP); if (ifp == NULL) { - if (BUS_TEARDOWN_INTR(device_get_parent(device), device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } @@ -351,11 +351,10 @@ int ar_detach(device_t device) { - device_t parent = device_get_parent(device); struct ar_hardc *hc = device_get_softc(device); if (hc->intr_cookie != NULL) { - if (BUS_TEARDOWN_INTR(parent, device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } ==== //depot/projects/uart/dev/mse/mse.c#4 (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/dev/mse/mse.c,v 1.72 2005/04/08 05:22:58 imp Exp $ + * $FreeBSD: src/sys/dev/mse/mse.c,v 1.73 2006/02/22 18:16:25 jhb Exp $ */ /* @@ -134,7 +134,7 @@ return ENXIO; } - if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr, + if (bus_setup_intr(dev, sc->sc_intr, INTR_TYPE_TTY, mseintr, sc, &sc->sc_ih)) { bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port); bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr); ==== //depot/projects/uart/dev/pcf/envctrl.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.5 2005/06/04 20:29:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.6 2006/02/22 18:16:25 jhb Exp $"); /* * Device specific driver for the SUNW,envctrl device found on some @@ -133,7 +133,7 @@ /* reset the chip */ pcf_rst_card(dev, IIC_FASTEST, PCF_DEFAULT_ADDR, NULL); - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -180,8 +180,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, - sc->intr_cookie); + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } ==== //depot/projects/uart/dev/pcf/pcf_ebus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.4 2005/06/04 20:29:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.5 2006/02/22 18:16:25 jhb Exp $"); /* * Device specific driver for the EBus i2c devices found on some sun4u @@ -193,7 +193,7 @@ pcf_rst_card(dev, IIC_FASTEST, own_addr, NULL); if (sc->res_irq) { - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -241,7 +241,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); ==== //depot/projects/uart/dev/pcf/pcf_isa.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.6 2006/02/02 23:57:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.7 2006/02/22 18:16:25 jhb Exp $"); /* * Hardware driver for a Philips PCF8584 I2C bus controller sitting @@ -153,7 +153,7 @@ pcf_rst_card(dev, IIC_FASTEST, PCF_DEFAULT_ADDR, NULL); if (sc->res_irq) { - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -201,8 +201,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, - sc->intr_cookie); + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } ==== //depot/projects/uart/dev/ppbus/if_plip.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.40 2006/02/13 17:53:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.41 2006/02/22 18:16:25 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -357,7 +357,7 @@ } /* attach our interrupt handler, later detached when the bus is released */ - if ((error = BUS_SETUP_INTR(ppbus, dev, sc->res_irq, + if ((error = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET, lp_intr, dev, &ih))) { ppb_release_bus(ppbus, dev); return (error); ==== //depot/projects/uart/dev/ppbus/lpt.c#7 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.37 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.38 2006/02/22 18:16:25 jhb Exp $"); /* * Device Driver for AT parallel printer port @@ -342,7 +342,7 @@ device_t dev; - dev = device_find_child(parent, LPT_NAME, 0); + dev = device_find_child(parent, LPT_NAME, -1); if (!dev) BUS_ADD_CHILD(parent, 0, LPT_NAME, -1); } @@ -744,7 +744,7 @@ /* if interrupts are working, register the handler */ if (sc->sc_irq & LP_USE_IRQ) { /* register our interrupt handler */ - err = BUS_SETUP_INTR(ppbus, lptdev, sc->intr_resource, + err = bus_setup_intr(lptdev, sc->intr_resource, INTR_TYPE_TTY, lpt_intr, lptdev, &sc->intr_cookie); if (err) { ==== //depot/projects/uart/dev/ppbus/ppi.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.39 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.40 2006/02/22 18:16:25 jhb Exp $"); #include "opt_ppb_1284.h" #include @@ -135,7 +135,7 @@ device_t dev; - dev = device_find_child(parent, "ppi", 0); + dev = device_find_child(parent, "ppi", -1); if (!dev) BUS_ADD_CHILD(parent, 0, "ppi", -1); } @@ -276,7 +276,7 @@ #ifdef PERIPH_1284 if (ppi->intr_resource) { /* register our interrupt handler */ - BUS_SETUP_INTR(device_get_parent(ppidev), ppidev, ppi->intr_resource, + bus_setup_intr(ppidev, ppi->intr_resource, INTR_TYPE_TTY, ppiintr, dev, &ppi->intr_cookie); } #endif /* PERIPH_1284 */ ==== //depot/projects/uart/dev/ppc/ppc.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.47 2005/12/21 10:54:47 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.49 2006/02/22 21:47:04 jhb Exp $"); #include "opt_ppc.h" @@ -1969,7 +1969,6 @@ struct ppc_data *ppc = DEVTOSOFTC(dev); device_t ppbus; - device_t parent = device_get_parent(dev); device_printf(dev, "%s chipset (%s) in %s mode%s\n", ppc_models[ppc->ppc_model], ppc_avms[ppc->ppc_avm], @@ -1997,8 +1996,8 @@ /* register the ppc interrupt handler as default */ if (ppc->res_irq) { /* default to the tty mask for registration */ /* XXX */ - if (BUS_SETUP_INTR(parent, dev, ppc->res_irq, INTR_TYPE_TTY, - ppcintr, dev, &ppc->intr_cookie) == 0) { + if (bus_setup_intr(dev, ppc->res_irq, INTR_TYPE_TTY, + ppcintr, dev, &ppc->intr_cookie) == 0) { /* remember the ppcintr is registered */ ppc->ppc_registered = 1; ==== //depot/projects/uart/dev/sio/sio.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.463 2005/12/07 07:23:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.464 2006/02/22 18:16:25 jhb Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -1074,11 +1074,11 @@ rid = 0; com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (com->irqres) { - ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, + ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, siointr, com, &com->cookie); if (ret) { - ret = BUS_SETUP_INTR(device_get_parent(dev), dev, + ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY, siointr, com, &com->cookie); if (ret == 0) ==== //depot/projects/uart/dev/sr/if_sr.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.70 2005/08/09 10:19:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.71 2006/02/22 18:16:26 jhb Exp $"); /* * Programming assumptions and other issues. @@ -389,7 +389,7 @@ src_init(hc); sr_init_sca(hc); - if (BUS_SETUP_INTR(device_get_parent(device), device, hc->res_irq, + if (bus_setup_intr(device, hc->res_irq, INTR_TYPE_NET, srintr, hc, &hc->intr_cookie) != 0) goto errexit; @@ -462,11 +462,10 @@ int sr_detach(device_t device) { - device_t parent = device_get_parent(device); struct sr_hardc *hc = device_get_softc(device); if (hc->intr_cookie != NULL) { - if (BUS_TEARDOWN_INTR(parent, device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } ==== //depot/projects/uart/dev/uart/uart_core.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.14 2005/10/28 06:30:39 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.15 2006/02/22 18:16:26 jhb Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -369,11 +369,11 @@ sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { - error = BUS_SETUP_INTR(device_get_parent(dev), dev, + error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, uart_intr, sc, &sc->sc_icookie); if (error) - error = BUS_SETUP_INTR(device_get_parent(dev), dev, + error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, uart_intr, sc, &sc->sc_icookie); else ==== //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.58 2006/02/22 17:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.59 2006/02/22 18:57:49 jhb Exp $"); #include "opt_pseudofs.h" @@ -99,6 +99,10 @@ if (pid != NO_PID) { if ((proc = pfind(pid)) == NULL) PFS_RETURN (0); + if (proc->p_flag & P_WEXIT) { + PROC_UNLOCK(proc); + PFS_RETURN (0); + } if (p_cansee(td, proc) != 0 || (pn->pn_vis != NULL && !(pn->pn_vis)(td, proc, pn))) { PROC_UNLOCK(proc); @@ -706,6 +710,10 @@ if (pvd->pvd_pid != NO_PID) { if ((proc = pfind(pvd->pvd_pid)) == NULL) PFS_RETURN (EIO); + if (proc->p_flag & P_WEXIT) { + PROC_UNLOCK(proc); + PFS_RETURN (EIO); + } _PHOLD(proc); PROC_UNLOCK(proc); } ==== //depot/projects/uart/i386/include/mptable.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/mptable.h,v 1.222 2005/01/06 22:18:15 imp Exp $ + * $FreeBSD: src/sys/i386/include/mptable.h,v 1.223 2006/02/22 21:38:33 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/uart/i386/linux/linux_ptrace.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.16 2005/07/02 20:06:44 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.17 2006/02/22 18:57:49 jhb Exp $"); #include "opt_cpu.h" @@ -356,6 +356,12 @@ break; } + /* Exiting processes can't be debugged. */ + if ((p->p_flag & P_WEXIT) != 0) { + error = ESRCH; + goto fail; + } + if ((error = p_candebug(td, p)) != 0) goto fail; ==== //depot/projects/uart/ia64/ia64/machdep.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.206 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.207 2006/02/22 18:57:49 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1097,6 +1097,7 @@ r->rnat = (bspst > kstk && (bspst & 0x1ffL) < (kstk & 0x1ffL)) ? *(uint64_t*)(kstk | 0x1f8L) : rnat; } else { + PHOLD(td->td_proc); iov.iov_base = (void*)(uintptr_t)kstk; iov.iov_len = r->ndirty; uio.uio_iov = &iov; @@ -1114,6 +1115,7 @@ */ if (uio.uio_resid != 0 && error == 0) error = ENOSPC; + PRELE(td->td_proc); } r->bspstore += r->ndirty; ==== //depot/projects/uart/kern/kern_condvar.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.54 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.55 2006/02/23 00:13:58 davidxu Exp $"); #include "opt_ktrace.h" @@ -192,18 +192,6 @@ sleepq_lock(cvp); - /* - * Don't bother sleeping if we are exiting and not the exiting - * thread or if our thread is marked as interrupted. - */ - mtx_lock_spin(&sched_lock); - rval = thread_sleep_check(td); - mtx_unlock_spin(&sched_lock); - if (rval != 0) { - sleepq_release(cvp); - return (rval); - } - cvp->cv_waiters++; DROP_GIANT(); mtx_unlock(mp); @@ -315,18 +303,6 @@ sleepq_lock(cvp); - /* - * Don't bother sleeping if we are exiting and not the exiting - * thread or if our thread is marked as interrupted. - */ - mtx_lock_spin(&sched_lock); - rval = thread_sleep_check(td); - mtx_unlock_spin(&sched_lock); - if (rval != 0) { - sleepq_release(cvp); - return (rval); - } - cvp->cv_waiters++; DROP_GIANT(); mtx_unlock(mp); ==== //depot/projects/uart/kern/kern_exit.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.284 2006/02/21 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.285 2006/02/22 18:57:49 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -175,7 +175,29 @@ */ } + /* + * Wakeup anyone in procfs' PIOCWAIT. They should have a hold + * on our vmspace, so we should block below until they have + * released their reference to us. Note that if they have + * requested S_EXIT stops we will block here until they ack + * via PIOCCONT. + */ + _STOPEVENT(p, S_EXIT, rv); + + /* + * Note that we are exiting and do another wakeup of anyone in + * PIOCWAIT in case they aren't listening for S_EXIT stops or + * decided to wait again after we told them we are exiting. + */ p->p_flag |= P_WEXIT; + wakeup(&p->p_stype); + + /* + * Wait for any processes that have a hold on our vmspace to + * release their reference. + */ + while (p->p_lock > 0) + msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); PROC_LOCK(p->p_pptr); sigqueue_take(p->p_ksi); @@ -209,11 +231,6 @@ mtx_unlock(&ppeers_lock); } - PROC_LOCK(p); - _STOPEVENT(p, S_EXIT, rv); - wakeup(&p->p_stype); /* Wakeup anyone in procfs' PIOCWAIT */ - PROC_UNLOCK(p); - /* * Check if any loadable modules need anything done at process exit. * E.g. SYSV IPC stuff ==== //depot/projects/uart/kern/kern_kse.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.222 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.223 2006/02/22 18:57:49 jhb Exp $"); #include #include @@ -148,7 +148,9 @@ td->td_mailbox = uap->tmbx; td->td_pflags |= TDP_CAN_UNBIND; } + PROC_LOCK(td->td_proc); if (td->td_proc->p_flag & P_TRACED) { + _PHOLD(td->td_proc); if (tmbx.tm_dflags & TMDF_SSTEP) ptrace_single_step(td); else @@ -160,7 +162,9 @@ ku->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); } + _PRELE(td->td_proc); } + PROC_UNLOCK(td->td_proc); } return ((error == 0) ? EJUSTRETURN : error); } @@ -782,8 +786,13 @@ */ cpu_set_upcall_kse(newtd, newku->ku_func, newku->ku_mailbox, &newku->ku_stack); - if (p->p_flag & P_TRACED) + PROC_LOCK(p); + if (p->p_flag & P_TRACED) { + _PHOLD(p); ptrace_clear_single_step(newtd); + _PRELE(p); + } + PROC_UNLOCK(p); } } @@ -1376,8 +1385,13 @@ if (!(ku->ku_mflags & KMF_NOUPCALL)) { cpu_set_upcall_kse(td, ku->ku_func, ku->ku_mailbox, &ku->ku_stack); - if (p->p_flag & P_TRACED) + PROC_LOCK(p); + if (p->p_flag & P_TRACED) { + _PHOLD(p); ptrace_clear_single_step(td); + _PRELE(p); + } + PROC_UNLOCK(p); error = suword32(&ku->ku_mailbox->km_lwp, td->td_tid); if (error) ==== //depot/projects/uart/kern/kern_sig.c#24 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.323 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.325 2006/02/23 09:24:19 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1189,35 +1189,40 @@ } } -again: +restart: for (i = 1; i <= _SIG_MAXSIG; ++i) { if (!SIGISMEMBER(waitset, i)) continue; - if (SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { - SIGFILLSET(td->td_sigmask); - SIG_CANTMASK(td->td_sigmask); - SIGDELSET(td->td_sigmask, i); - mtx_lock(&ps->ps_mtx); - sig = cursig(td); - i = 0; - mtx_unlock(&ps->ps_mtx); - } else if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { - if (p->p_flag & P_SA) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } - sigqueue_move(&p->p_sigqueue, &td->td_sigqueue, i); - SIGFILLSET(td->td_sigmask); - SIG_CANTMASK(td->td_sigmask); - SIGDELSET(td->td_sigmask, i); - mtx_lock(&ps->ps_mtx); - sig = cursig(td); - i = 0; - mtx_unlock(&ps->ps_mtx); + if (!SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { + if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { + if (p->p_flag & P_SA) { + p->p_flag |= P_SIGEVENT; + wakeup(&p->p_siglist); + } + sigqueue_move(&p->p_sigqueue, + &td->td_sigqueue, i); + } else + continue; } + + SIGFILLSET(td->td_sigmask); + SIG_CANTMASK(td->td_sigmask); + SIGDELSET(td->td_sigmask, i); + mtx_lock(&ps->ps_mtx); + sig = cursig(td); + mtx_unlock(&ps->ps_mtx); if (sig) goto out; + else { + /* + * Because cursig() may have stopped current thread, + * after it is resumed, things may have already been + * changed, it should rescan any pending signals. + */ + goto restart; + } } + if (error) goto out; @@ -1255,30 +1260,37 @@ error = 0; } } - goto again; + goto restart; out: + td->td_sigmask = savedmask; + signotify(td); if (sig) { - sig_t action; - ksiginfo_init(ksi); sigqueue_get(&td->td_sigqueue, sig, ksi); ksi->ksi_signo = sig; if (ksi->ksi_code == SI_TIMER) itimer_accept(p, ksi->ksi_timerid, ksi); error = 0; - mtx_lock(&ps->ps_mtx); - action = ps->ps_sigact[_SIG_IDX(sig)]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 23 17:24:51 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 D24E216A423; Thu, 23 Feb 2006 17:24:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 965C416A420 for ; Thu, 23 Feb 2006 17:24:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60E2543D48 for ; Thu, 23 Feb 2006 17:24:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NHOoFn010272 for ; Thu, 23 Feb 2006 17:24:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NHOo0p010269 for perforce@freebsd.org; Thu, 23 Feb 2006 17:24:50 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Feb 2006 17:24:50 GMT Message-Id: <200602231724.k1NHOo0p010269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92273 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, 23 Feb 2006 17:24:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92273 Change 92273 by jhb@jhb_slimer on 2006/02/23 17:24:25 Use callout_init_mtx(). Now callout_stop() while holding the mutex will definitely stop the callout, so the callout_drain() isn't even needed anymore. Affected files ... .. //depot/projects/smpng/sys/dev/fdc/fdc.c#21 edit Differences ... ==== //depot/projects/smpng/sys/dev/fdc/fdc.c#21 (text+ko) ==== @@ -616,7 +616,7 @@ int once; fd = arg; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd->flags &= ~FD_MOTORWAIT; fd->flags |= FD_MOTOR; once = 0; @@ -627,7 +627,6 @@ bioq_disksort(&fd->fdc->head, bp); once = 1; } - mtx_unlock(&fd->fdc->fdc_mtx); if (once) wakeup(&fd->fdc->head); } @@ -646,11 +645,6 @@ fdc->fdout |= (FDO_MOEN0 << fd->fdsu); callout_reset(&fd->toffhandle, hz, fd_turnon, fd); } else { - /* - * We can't call drain from a callout and we can't call it - * while holding a lock needed by the callout being drained, - * so use stop for now. - */ callout_stop(&fd->toffhandle); fd->flags &= ~(FD_MOTOR|FD_MOTORWAIT); fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu); @@ -663,9 +657,8 @@ { struct fd_data *fd = xfd; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd_motor(fd, 0); - mtx_unlock(&fd->fdc->fdc_mtx); } /* @@ -1203,7 +1196,6 @@ mtx_lock(&fdc->fdc_mtx); /* If we go from idle, cancel motor turnoff */ if (fd->fd_iocount++ == 0) - /* XXX: Can't drain while holding mutex. */ callout_stop(&fd->toffhandle); if (fd->flags & FD_MOTOR) { /* The motor is on, send it directly to the controller */ @@ -1944,7 +1936,7 @@ fd->fdc = fdc; fd->fdsu = fdsu; fd->options = 0; - callout_init(&fd->toffhandle, 1); + callout_init_mtx(&fd->toffhandle, &fd->fdc->fdc_mtx, 0); /* initialize densities for subdevices */ fdsettype(fd, fd_native_types[fd->type]); From owner-p4-projects@FreeBSD.ORG Thu Feb 23 17:54: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 2C04616A423; Thu, 23 Feb 2006 17:54:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F23E116A420 for ; Thu, 23 Feb 2006 17:54:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1BA243D7C for ; Thu, 23 Feb 2006 17:54:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NHsS22011375 for ; Thu, 23 Feb 2006 17:54:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NHsSvU011372 for perforce@freebsd.org; Thu, 23 Feb 2006 17:54:28 GMT (envelope-from imp@freebsd.org) Date: Thu, 23 Feb 2006 17:54:28 GMT Message-Id: <200602231754.k1NHsSvU011372@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 92276 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, 23 Feb 2006 17:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92276 Change 92276 by imp@imp_harmony on 2006/02/23 17:53:53 IFC @92274 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/arm/src/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_smbat.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#5 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#16 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/arm/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/arm/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/arm/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/arm/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/arm/src/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/arm/src/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/arm/src/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/arm/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/arm/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/arm/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/arm/src/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/arm/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/arm/src/sys/dev/puc/puc.c#6 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/arm/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/arm/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/arm/src/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_slice.h#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.c#5 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/arm/src/sys/i386/include/mptable.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_ptrace.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#10 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/arm/src/sys/modules/Makefile#13 integrate .. //depot/projects/arm/src/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/nfs4client/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/twa/Makefile#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp.h#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/arm/src/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/arm/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/arm/src/sys/sys/proc.h#10 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#7 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/machdep.c#5 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.238 2006/02/22 18:57:48 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1756,6 +1756,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1773,6 +1775,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1836,6 +1840,8 @@ static int ptrace_clear_bpt(struct thread *td, struct mdbpt *bpt) { + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); return ptrace_write_int(td, bpt->addr, bpt->contents); } @@ -1844,6 +1850,8 @@ { int error; u_int32_t bpins = 0x00000080; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); error = ptrace_read_int(td, bpt->addr, &bpt->contents); if (error) return error; @@ -1853,12 +1861,20 @@ int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); if (td->td_md.md_flags & MDTD_STEP2) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP2; } else if (td->td_md.md_flags & MDTD_STEP1) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP1; } return 0; @@ -1867,6 +1883,7 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; vm_offset_t pc = td->td_frame->tf_regs[FRAME_PC]; alpha_instruction ins; @@ -1876,9 +1893,11 @@ if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, pc, &ins.bits); if (error) - return (error); + goto out; switch (ins.branch_format.opcode) { @@ -1918,18 +1937,20 @@ td->td_md.md_sstep[0].addr = addr[0]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]); if (error) - return (error); + goto out; if (count == 2) { td->td_md.md_sstep[1].addr = addr[1]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]); if (error) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - return (error); + goto out; } td->td_md.md_flags |= MDTD_STEP2; } else td->td_md.md_flags |= MDTD_STEP1; +out: + PROC_LOCK(p); return (error); } ==== //depot/projects/arm/src/sys/alpha/alpha/trap.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.129 2006/02/22 18:57:49 jhb Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -403,8 +403,12 @@ case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); + PROC_LOCK(p); + _PHOLD(p); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; + _PRELE(p); + PROC_UNLOCK(p); mtx_unlock(&Giant); } ucode = a0; /* trap type */ ==== //depot/projects/arm/src/sys/arm/arm/machdep.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.20 2005/11/24 08:16:17 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.21 2006/02/22 18:57:49 jhb Exp $"); #include #include @@ -327,6 +327,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -344,6 +346,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -359,28 +363,38 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; KASSERT(td->td_md.md_ptrace_instr == 0, ("Didn't clear single step")); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, td->td_frame->tf_pc + 4, &td->td_md.md_ptrace_instr); if (error) - return (error); + goto out; error = ptrace_write_int(td, td->td_frame->tf_pc + 4, PTRACE_BREAKPOINT); if (error) td->td_md.md_ptrace_instr = 0; td->td_md.md_ptrace_addr = td->td_frame->tf_pc + 4; +out: + PROC_LOCK(p); return (error); } int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + if (td->td_md.md_ptrace_instr) { + p = td->td_proc; + PROC_UNLOCK(p); ptrace_write_int(td, td->td_md.md_ptrace_addr, td->td_md.md_ptrace_instr); + PROC_LOCK(p); td->td_md.md_ptrace_instr = 0; } return (0); ==== //depot/projects/arm/src/sys/arm/arm/undefined.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.10 2006/02/03 06:27:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); #include #include @@ -261,7 +261,11 @@ break; if (fault_code & FAULT_USER && fault_instruction == PTRACE_BREAKPOINT) { + PROC_LOCK(td->td_proc); + _PHOLD(td->td_proc); ptrace_clear_single_step(td); + _PRELE(td->td_proc); + PROC_UNLOCK(td->td_proc); return; } ==== //depot/projects/arm/src/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.203 2006/02/17 04:59:23 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.205 2006/02/20 01:08:33 mlaier Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -137,13 +137,15 @@ .for _firmw in ${FIRMWS} ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} -.if !exists(${.CURDIR}/${_firmw:C/\:.*$//}) - ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//} - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} - rm -f ${_firmw:C/\:.*$//} -.else - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} -.endif + @if [ -e ${_firmw:C/\:.*$//} ]; then \ + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ + ${_firmw:C/\:.*$//}; \ + else \ + ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \ + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ + ${_firmw:C/\:.*$//}; \ + rm ${_firmw:C/\:.*$//}; \ + fi OBJS+= ${_firmw:C/\:.*$/.fwo/} .endfor ==== //depot/projects/arm/src/sys/dev/acpica/acpi_smbat.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.4 2006/01/12 21:56:37 bruno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.5 2006/02/21 03:16:58 njl Exp $"); #include "opt_acpi.h" #include @@ -134,9 +134,7 @@ static int acpi_smbat_shutdown(device_t dev) { - struct acpi_smbat_softc *sc; - sc = device_get_softc(dev); acpi_battery_remove(dev); return (0); } ==== //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.8 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.9 2006/02/21 03:15:26 njl Exp $"); #include "opt_acpi.h" #include @@ -345,10 +345,8 @@ static int acpi_thr_settings(device_t dev, struct cf_setting *sets, int *count) { - struct acpi_throttle_softc *sc; int i, speed; - sc = device_get_softc(dev); if (sets == NULL || count == NULL) return (EINVAL); if (*count < CPU_MAX_SPEED) ==== //depot/projects/arm/src/sys/dev/ar/if_ar.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.72 2005/08/09 10:19:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.73 2006/02/22 18:16:24 jhb Exp $"); /* * Programming assumptions and other issues. @@ -258,7 +258,7 @@ arc_init(hc); - if(BUS_SETUP_INTR(device_get_parent(device), device, hc->res_irq, + if(bus_setup_intr(device, hc->res_irq, INTR_TYPE_NET, arintr, hc, &hc->intr_cookie) != 0) return (1); @@ -285,7 +285,7 @@ #ifndef NETGRAPH ifp = SC2IFP(sc) = if_alloc(IFT_PPP); if (ifp == NULL) { - if (BUS_TEARDOWN_INTR(device_get_parent(device), device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } @@ -351,11 +351,10 @@ int ar_detach(device_t device) { - device_t parent = device_get_parent(device); struct ar_hardc *hc = device_get_softc(device); if (hc->intr_cookie != NULL) { - if (BUS_TEARDOWN_INTR(parent, device, + if (bus_teardown_intr(device, hc->res_irq, hc->intr_cookie) != 0) { printf("intr teardown failed.. continuing\n"); } ==== //depot/projects/arm/src/sys/dev/ed/if_ed_cbus.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.25 2006/01/27 19:10:13 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.26 2006/02/21 12:01:39 nyan Exp $ */ #include @@ -541,6 +541,8 @@ sc->port_rid = rid; sc->port_res = res; sc->port_used = n; + sc->port_bst = rman_get_bustag(res); + sc->port_bsh = rman_get_bushandle(res); /* Re-map i/o table if needed */ switch (sc->type) { ==== //depot/projects/arm/src/sys/dev/em/if_em.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.113 2006/02/15 14:27:38 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.114 2006/02/22 14:11:16 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -954,7 +954,13 @@ /* Get the latest mac address, User can use a LAA */ bcopy(IF_LLADDR(sc->ifp), sc->hw.mac_addr, ETHER_ADDR_LEN); - em_init_rx_addrs(&sc->hw); + + /* Initialize the hardware */ + if (em_hardware_init(sc)) { + device_printf(dev, "Unable to initialize the hardware\n"); + return; + } + em_update_link_status(sc); if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) em_enable_vlans(sc); ==== //depot/projects/arm/src/sys/dev/fdc/fdc_acpi.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.11 2005/09/11 18:39:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.12 2006/02/21 03:19:24 njl Exp $"); #include #include @@ -98,7 +98,6 @@ device_t bus; int error, fde_count, i; ACPI_OBJECT *obj, *pkg; - ACPI_HANDLE h; uint32_t fde[ACPI_FDC_MAXDEVS]; /* Get our softc and use the same accessor as ISA. */ @@ -107,7 +106,6 @@ /* Initialize variables and get a temporary buffer for _FDE. */ error = ENXIO; - h = acpi_get_handle(dev); buf.Length = ACPI_FDC_BUFLEN; buf.Pointer = malloc(buf.Length, M_TEMP, M_NOWAIT | M_ZERO); if (buf.Pointer == NULL) ==== //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.27 2006/01/29 12:03:03 damien Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.28 2006/02/20 20:49:56 sam Exp $ */ /*- * Copyright (c) 2004-2006 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.27 2006/01/29 12:03:03 damien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.28 2006/02/20 20:49:56 sam Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2380,7 +2380,7 @@ assoc.auth = ic->ic_crypto.cs_def_txkey << 4 | IWI_AUTH_SHARED; if ((ic->ic_flags & IEEE80211_F_WME) && ni->ni_wme_ie != NULL) assoc.policy |= htole16(IWI_POLICY_WME); - if (ic->ic_opt_ie != NULL) + if (ic->ic_flags & IEEE80211_F_WPA) assoc.policy |= htole16(IWI_POLICY_WPA); memcpy(assoc.tstamp, ni->ni_tstamp.data, 8); ==== //depot/projects/arm/src/sys/dev/le/am7990.c#2 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/am7990.c,v 1.1 2006/01/31 14:48:58 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/am7990.c,v 1.2 2006/02/21 20:20:43 marius Exp $"); #include #include @@ -357,10 +357,7 @@ sc->sc_first_td = bix; - am7990_start_locked(sc); - - if (sc->sc_no_td == 0) - ifp->if_timer = 0; + ifp->if_timer = sc->sc_no_td > 0 ? 5 : 0; } /* @@ -392,6 +389,18 @@ return; } + /* + * Clear interrupt source flags and turn off interrupts. If we + * don't clear these flags before processing their sources we + * could completely miss some interrupt events as the the NIC + * can change these flags while we're in this handler. We turn + * of interrupts while processing them so we don't get another + * one while we still process the previous one in ifp->if_input() + * with the driver lock dropped. + */ + (*sc->sc_wrcsr)(sc, LE_CSR0, isr & ~(LE_C0_INEA | LE_C0_TDMD | + LE_C0_STOP | LE_C0_STRT | LE_C0_INIT)); + if (isr & LE_C0_ERR) { if (isr & LE_C0_BABL) { #ifdef LEDEBUG @@ -446,16 +455,11 @@ if (isr & LE_C0_TINT) am7990_tint(sc); - /* - * Note that since we drop the driver lock in lance_read() we might - * get another interrupt while in ifp->if_input(). Consequently we - * don't want to acknowledge a receive interrupt before it's fully - * serviced. We could acknowledge interrupts of other types earlier - * but that won't buy us much as as the driver lock is held until - * the end of this ISR. - */ - (*sc->sc_wrcsr)(sc, LE_CSR0, isr & (LE_C0_INEA | LE_C0_BABL | - LE_C0_MISS | LE_C0_MERR | LE_C0_RINT | LE_C0_TINT | LE_C0_IDON)); + /* Enable interrupts again. */ + (*sc->sc_wrcsr)(sc, LE_CSR0, LE_C0_INEA); + + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + am7990_start_locked(sc); LE_UNLOCK(sc); } @@ -471,7 +475,7 @@ struct ifnet *ifp = sc->sc_ifp; struct letmd tmd; struct mbuf *m; - int bix, len, rp; + int bix, enq, len, rp; LE_LOCK_ASSERT(sc, MA_OWNED); @@ -480,6 +484,7 @@ return; bix = sc->sc_last_td; + enq = 0; for (; sc->sc_no_td < sc->sc_ntbuf && !IFQ_DRV_IS_EMPTY(&ifp->if_snd);) { @@ -513,8 +518,6 @@ if_printf(ifp, "packet length %d\n", len); #endif - ifp->if_timer = 5; - /* * Init transmit registers, and set transmit start flag. */ @@ -530,6 +533,7 @@ #endif (*sc->sc_wrcsr)(sc, LE_CSR0, LE_C0_INEA | LE_C0_TDMD); + enq++; if (++bix == sc->sc_ntbuf) bix = 0; @@ -541,6 +545,9 @@ } sc->sc_last_td = bix; + + if (enq > 0) + ifp->if_timer = 5; } #ifdef LEDEBUG ==== //depot/projects/arm/src/sys/dev/le/am79900.c#2 (text+ko) ==== @@ -110,7 +110,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/am79900.c,v 1.1 2006/01/31 14:48:58 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/am79900.c,v 1.2 2006/02/21 20:20:43 marius Exp $"); #include #include @@ -399,10 +399,7 @@ sc->sc_first_td = bix; - am79900_start_locked(sc); - - if (sc->sc_no_td == 0) - ifp->if_timer = 0; + ifp->if_timer = sc->sc_no_td > 0 ? 5 : 0; } /* @@ -434,6 +431,18 @@ return; } + /* + * Clear interrupt source flags and turn off interrupts. If we + * don't clear these flags before processing their sources we + * could completely miss some interrupt events as the the NIC + * can change these flags while we're in this handler. We turn + * of interrupts while processing them so we don't get another + * one while we still process the previous one in ifp->if_input() + * with the driver lock dropped. + */ + (*sc->sc_wrcsr)(sc, LE_CSR0, isr & ~(LE_C0_INEA | LE_C0_TDMD | + LE_C0_STOP | LE_C0_STRT | LE_C0_INIT)); + if (isr & LE_C0_ERR) { if (isr & LE_C0_BABL) { #ifdef LEDEBUG @@ -488,16 +497,11 @@ if (isr & LE_C0_TINT) am79900_tint(sc); - /* - * Note that since we drop the driver lock in lance_read() we might - * get another interrupt while in ifp->if_input(). Consequently we - * don't want to acknowledge a receive interrupt before it's fully - * serviced. We could acknowledge interrupts of other types earlier - * but that won't buy us much as as the driver lock is held until - * the end of this ISR. - */ - (*sc->sc_wrcsr)(sc, LE_CSR0, isr & (LE_C0_INEA | LE_C0_BABL | - LE_C0_MISS | LE_C0_MERR | LE_C0_RINT | LE_C0_TINT | LE_C0_IDON)); + /* Enable interrupts again. */ + (*sc->sc_wrcsr)(sc, LE_CSR0, LE_C0_INEA); + + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + am79900_start_locked(sc); LE_UNLOCK(sc); } @@ -513,7 +517,7 @@ struct ifnet *ifp = sc->sc_ifp; struct letmd tmd; struct mbuf *m; - int bix, len, rp; + int bix, enq, len, rp; LE_LOCK_ASSERT(sc, MA_OWNED); @@ -522,6 +526,7 @@ return; bix = sc->sc_last_td; + enq = 0; for (; sc->sc_no_td < sc->sc_ntbuf && !IFQ_DRV_IS_EMPTY(&ifp->if_snd);) { @@ -555,8 +560,6 @@ if_printf(ifp, "packet length %d\n", len); #endif - ifp->if_timer = 5; - /* * Init transmit registers, and set transmit start flag. */ @@ -573,6 +576,7 @@ #endif (*sc->sc_wrcsr)(sc, LE_CSR0, LE_C0_INEA | LE_C0_TDMD); + enq++; if (++bix == sc->sc_ntbuf) bix = 0; @@ -584,6 +588,9 @@ } sc->sc_last_td = bix; + + if (enq > 0) + ifp->if_timer = 5; } #ifdef LEDEBUG ==== //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#4 (text+ko) ==== @@ -60,7 +60,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.4 2006/02/11 01:35:29 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.5 2006/02/22 05:19:50 mjacob Exp $"); #include #include @@ -375,8 +375,8 @@ bad: if (error != 0) { - /* if (error != EFBIG) */ - mpt_prt(mpt, "bus_dmamap_load returned %d\n", error); + if (error != EFBIG && error != ENOMEM) + mpt_prt(mpt, "mpt_execute_req: err %d\n", error); if (ccb->ccb_h.status == CAM_REQ_INPROG) { xpt_freeze_devq(ccb->ccb_h.path, 1); ccb->ccb_h.status = CAM_DEV_QFRZN; ==== //depot/projects/arm/src/sys/dev/mse/mse.c#3 (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/dev/mse/mse.c,v 1.72 2005/04/08 05:22:58 imp Exp $ + * $FreeBSD: src/sys/dev/mse/mse.c,v 1.73 2006/02/22 18:16:25 jhb Exp $ */ /* @@ -134,7 +134,7 @@ return ENXIO; } - if (BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_intr, + if (bus_setup_intr(dev, sc->sc_intr, INTR_TYPE_TTY, mseintr, sc, &sc->sc_ih)) { bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port); bus_release_resource(dev, SYS_RES_IRQ, rid, sc->sc_intr); ==== //depot/projects/arm/src/sys/dev/pcf/envctrl.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.5 2005/06/04 20:29:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.6 2006/02/22 18:16:25 jhb Exp $"); /* * Device specific driver for the SUNW,envctrl device found on some @@ -133,7 +133,7 @@ /* reset the chip */ pcf_rst_card(dev, IIC_FASTEST, PCF_DEFAULT_ADDR, NULL); - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -180,8 +180,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, - sc->intr_cookie); + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } ==== //depot/projects/arm/src/sys/dev/pcf/pcf_ebus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.4 2005/06/04 20:29:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.5 2006/02/22 18:16:25 jhb Exp $"); /* * Device specific driver for the EBus i2c devices found on some sun4u @@ -193,7 +193,7 @@ pcf_rst_card(dev, IIC_FASTEST, own_addr, NULL); if (sc->res_irq) { - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -241,7 +241,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); ==== //depot/projects/arm/src/sys/dev/pcf/pcf_isa.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.6 2006/02/02 23:57:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.7 2006/02/22 18:16:25 jhb Exp $"); /* * Hardware driver for a Philips PCF8584 I2C bus controller sitting @@ -153,7 +153,7 @@ pcf_rst_card(dev, IIC_FASTEST, PCF_DEFAULT_ADDR, NULL); if (sc->res_irq) { - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, &sc->intr_cookie); if (rv) { @@ -201,8 +201,7 @@ return (rv); if (sc->res_irq != 0) { - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, sc->res_irq, - sc->intr_cookie); + bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } ==== //depot/projects/arm/src/sys/dev/ppbus/if_plip.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.40 2006/02/13 17:53:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.41 2006/02/22 18:16:25 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -357,7 +357,7 @@ } /* attach our interrupt handler, later detached when the bus is released */ - if ((error = BUS_SETUP_INTR(ppbus, dev, sc->res_irq, + if ((error = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET, lp_intr, dev, &ih))) { ppb_release_bus(ppbus, dev); return (error); ==== //depot/projects/arm/src/sys/dev/ppbus/lpt.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.37 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.38 2006/02/22 18:16:25 jhb Exp $"); /* * Device Driver for AT parallel printer port @@ -342,7 +342,7 @@ device_t dev; - dev = device_find_child(parent, LPT_NAME, 0); + dev = device_find_child(parent, LPT_NAME, -1); if (!dev) BUS_ADD_CHILD(parent, 0, LPT_NAME, -1); } @@ -744,7 +744,7 @@ /* if interrupts are working, register the handler */ if (sc->sc_irq & LP_USE_IRQ) { /* register our interrupt handler */ - err = BUS_SETUP_INTR(ppbus, lptdev, sc->intr_resource, + err = bus_setup_intr(lptdev, sc->intr_resource, INTR_TYPE_TTY, lpt_intr, lptdev, &sc->intr_cookie); if (err) { ==== //depot/projects/arm/src/sys/dev/ppbus/ppi.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.39 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.40 2006/02/22 18:16:25 jhb Exp $"); #include "opt_ppb_1284.h" #include @@ -135,7 +135,7 @@ device_t dev; - dev = device_find_child(parent, "ppi", 0); + dev = device_find_child(parent, "ppi", -1); if (!dev) BUS_ADD_CHILD(parent, 0, "ppi", -1); } @@ -276,7 +276,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 23 18:59: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 260C216A423; Thu, 23 Feb 2006 18:59:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A4716A420 for ; Thu, 23 Feb 2006 18:59:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F1EC43D55 for ; Thu, 23 Feb 2006 18:59:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NIxm5c014119 for ; Thu, 23 Feb 2006 18:59:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NIxmcY014116 for perforce@freebsd.org; Thu, 23 Feb 2006 18:59:48 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 18:59:48 GMT Message-Id: <200602231859.k1NIxmcY014116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92279 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, 23 Feb 2006 18:59:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92279 Change 92279 by millert@millert_g4tower on 2006/02/23 18:59:05 Remove security.h in the clean pass too Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#4 (text+ko) ==== @@ -26,12 +26,12 @@ $(DSTROOT)/usr/share/man/man3/ clean: - rm -f lib$(LIB).a $(OBJS) security.c + rm -f lib$(LIB).a $(OBJS) security.[ch] lib$(LIB).a:: $(OBJS) rm -f lib$(LIB).a $(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q` $(RANLIB) lib$(LIB).a -security.c: $(MIGSOURCE)/security.defs +security.c security.h: $(MIGSOURCE)/security.defs mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $(MIGSOURCE)/security.defs From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:03: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 7FDFD16A424; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 432EA16A420 for ; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 065F643D4C for ; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJ3rAH014293 for ; Thu, 23 Feb 2006 19:03:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJ3rU0014290 for perforce@freebsd.org; Thu, 23 Feb 2006 19:03:53 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:03:53 GMT Message-Id: <200602231903.k1NJ3rU0014290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92280 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, 23 Feb 2006 19:03:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92280 Change 92280 by millert@millert_g4tower on 2006/02/23 19:02:58 Fix long-standing panic. io_free() calls mac_destroy_port_label() on a potentially-uninitialized port label. To fix, be sure to always intialized a port's label after its creation by io_alloc(). The best place for this is right after the ipc_port_t is bzero()d. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#8 (text+ko) ==== @@ -336,6 +336,9 @@ ipc_port_t port = (ipc_port_t)object; bzero((char *)port, sizeof(*port)); +#ifdef MAC + mac_init_port_label(&port->ip_label); +#endif } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; @@ -404,6 +407,9 @@ ipc_port_t port = (ipc_port_t)object; bzero((char *)port, sizeof(*port)); +#ifdef MAC + mac_init_port_label(&port->ip_label); +#endif } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; @@ -999,7 +1005,8 @@ * User allocated label handles can never be modified. */ -struct label *io_getlabel (ipc_object_t objp) +struct label *io_getlabel( + ipc_object_t objp) { ipc_port_t port = (ipc_port_t) objp; @@ -1030,10 +1037,8 @@ #endif /* MACH_ASSERT */ #ifdef MAC - /* XXX: This was never getting called before, - and calling it now causes problems. */ - - mac_destroy_port_label (&port->ip_label); + /* Port label should have been initialized after creation. */ + mac_destroy_port_label(&port->ip_label); #endif } zfree(ipc_object_zones[otype], (vm_offset_t) object); From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:14:08 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 C61A716A423; Thu, 23 Feb 2006 19:14:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A32216A420 for ; Thu, 23 Feb 2006 19:14:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E7B43D4C for ; Thu, 23 Feb 2006 19:14:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJE6Dj014779 for ; Thu, 23 Feb 2006 19:14:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJE6eb014776 for perforce@freebsd.org; Thu, 23 Feb 2006 19:14:06 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:14:06 GMT Message-Id: <200602231914.k1NJE6eb014776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92281 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, 23 Feb 2006 19:14:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92281 Change 92281 by millert@millert_g4tower on 2006/02/23 19:13:15 Style fixes Add labelh_new_user() function that allocates a label handle and a normal ipc port in the specified task's address space. The specified label is inserted into the label handle and a send/receive right for the label handle's port is inserted into the task's space. The port name is passed back in the namep parameter. Unlike labelh_new() the specified task now holds the receive right for the port which means that when the task dies (or calls mach_port_destroy()), the port and label handle will be garbage collected. Use labelh_new_user() in mac_label_new(). Use labelh_new() in labelh_duplicate(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,105 +31,162 @@ zone_t ipc_labelh_zone; -kern_return_t mac_label_new (ipc_space_t task, mach_port_name_t *name, - vm_offset_t labelstr) +/* + * Create a new label handle in the task described by the specified space. + * The specified label is used in the label handle. The associated port + * name is copied out to namep and the task is granted send and receive rights. + */ +kern_return_t +labelh_new_user(ipc_space_t space, struct label *inl, mach_port_name_t *namep) { - ipc_labelh_t lh; - struct label inl; - ipc_port_t port, sport; - kern_return_t kr; + kern_return_t kr; + ipc_labelh_t lh; + ipc_entry_t entry; + ipc_port_t port; + + if (space == IS_NULL || space->is_task == NULL) + return (KERN_INVALID_TASK); + + /* XXX - perform entrypoint check here */ - if (task == IS_NULL) - return (KERN_INVALID_TASK); + /* + * Note: the calling task will have a receive right for the port. + * This is different from label handles that reference tasks + * where the kernel holds the receive right and the caller only + * gets a send right. + */ + kr = ipc_port_alloc(space, namep, &port); + if (kr != KERN_SUCCESS) + return (kr); + ip_reference(port); /* ipc_port_alloc() does not add a reference */ - mac_init_port_label (&inl); - if (mac_internalize_port_label (&inl, labelstr)) - return KERN_INVALID_ARGUMENT; + /* Convert right to MACH_PORT_TYPE_SEND_RECEIVE */ + port->ip_mscount++; + port->ip_srights++; + is_write_lock(space); + entry = ipc_entry_lookup(space, *namep); + if (entry != IE_NULL) + entry->ie_bits |= MACH_PORT_TYPE_SEND; + is_write_unlock(space); - port = ipc_port_alloc_kernel(); + /* Allocate new label handle, insert port and label. */ + lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); + io_lock_init(lh); + lh->lh_port = port; + lh->lh_label = *inl; + lh->lh_type = 0; + lh->lh_references = 1; - lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = port; - lh->lh_type = 0; - lh->lh_references = 1; - lh->lh_label = inl; - ipc_kobject_set(port, (ipc_kobject_t)lh, IKOT_LABELH); + /* Must call ipc_kobject_set() with port unlocked. */ + ip_unlock(lh->lh_port); + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - sport = ipc_port_make_send_locked(port); - ip_release(port); - ip_unlock(port); - *name = ipc_port_copyout_send (port,task); - return 0; + return (KERN_SUCCESS); } -/* This function should be used to allocate label handles - that are stored in other kernel objects, such as tasks. - They must be released along with that object. - The caller gets one reference, which can be applied to either the - port or the ipc_label_t structure itself. -*/ -ipc_labelh_t labelh_new () +kern_return_t +mac_label_new(ipc_space_t space, mach_port_name_t *namep, vm_offset_t labelstr) { - ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; - lh->lh_references = 1; - ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - ip_unlock(lh->lh_port); - return lh; + struct label inl; + kern_return_t kr; + + mac_init_port_label(&inl); + if (mac_internalize_port_label(&inl, labelstr)) + return (KERN_INVALID_ARGUMENT); + + kr = labelh_new_user(space, &inl, namep); + if (kr != KERN_SUCCESS) { + mac_destroy_port_label(&inl); + return (kr); + } + + return (KERN_SUCCESS); } -/* call with old locked; returned object is unlocked */ +/* + * This function should be used to allocate label handles + * that are stored in other kernel objects, such as tasks. + * They must be released along with that object. + * The caller gets one reference, which can be applied to either the + * port or the ipc_label_t structure itself. + */ +ipc_labelh_t +labelh_new(void) +{ + ipc_labelh_t lh; + + lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); + io_lock_init(lh); + lh->lh_port = ipc_port_alloc_kernel(); + lh->lh_type = 0; + lh->lh_references = 1; + ip_unlock(lh->lh_port); + + /* Must call ipc_kobject_set() with port unlocked. */ + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); + + return (lh); +} -ipc_labelh_t labelh_duplicate (ipc_labelh_t old) +/* + * Call with old label handle locked. + * Returned label handle is unlocked. + */ +ipc_labelh_t +labelh_duplicate(ipc_labelh_t old) { - ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; - lh->lh_references = 1; - ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - mac_init_port_label (&lh->lh_label); - mac_copy_port_label (&old->lh_label, &lh->lh_label); - ip_unlock(lh->lh_port); - return lh; + ipc_labelh_t lh; + + lh = labelh_new(); + ip_lock(lh->lh_port); + mac_init_port_label(&lh->lh_label); + mac_copy_port_label(&old->lh_label, &lh->lh_label); + ip_unlock(lh->lh_port); + return (lh); } -/* call with old locked; returns a locked object */ +/* + * Call with old label handle locked. + * Returned label handle is locked. + */ +ipc_labelh_t +labelh_modify(ipc_labelh_t old) +{ + ipc_labelh_t lh; -ipc_labelh_t labelh_modify (ipc_labelh_t old) -{ - if (old->lh_references == 1) - return old; - ipc_labelh_t lh = labelh_duplicate (old); - lh_release(old); - lh_check_unlock (old); - lh_lock (lh); - return lh; + if (old->lh_references == 1) + return (old); + lh = labelh_duplicate(old); + lh_release(old); + lh_check_unlock(old); + lh_lock(lh); + return (lh); } -/* add or drop a reference on a label handle; not locked */ - -ipc_labelh_t labelh_reference (ipc_labelh_t lh) +/* + * Add or drop a reference on an (unlocked) label handle. + */ +ipc_labelh_t +labelh_reference(ipc_labelh_t lh) { - lh_lock(lh); - lh_reference(lh); - lh_unlock(lh); - return lh; + lh_lock(lh); + lh_reference(lh); + lh_unlock(lh); + return (lh); } -void labelh_release(ipc_labelh_t lh) +void +labelh_release(ipc_labelh_t lh) { - lh_lock(lh); - lh_release(lh); - lh_check_unlock(lh); + lh_lock(lh); + lh_release(lh); + lh_check_unlock(lh); } -void lh_free (ipc_labelh_t lh) +void +lh_free(ipc_labelh_t lh) { - ipc_object_release(&lh->lh_port->ip_object); - mac_destroy_port_label (&lh->lh_label); - zfree(ipc_labelh_zone, (vm_offset_t)lh); + ipc_object_release(&lh->lh_port->ip_object); + mac_destroy_port_label(&lh->lh_label); + zfree(ipc_labelh_zone, (vm_offset_t)lh); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,16 +44,18 @@ #endif } *ipc_labelh_t; -ipc_labelh_t labelh_duplicate (ipc_labelh_t old); -ipc_labelh_t labelh_modify (ipc_labelh_t old); -void labelh_release (ipc_labelh_t lh); -ipc_labelh_t labelh_reference (ipc_labelh_t lh); -void lh_free (ipc_labelh_t lh); +ipc_labelh_t labelh_duplicate(ipc_labelh_t old); +ipc_labelh_t labelh_modify(ipc_labelh_t old); +ipc_labelh_t labelh_new(void); +kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); +void labelh_release(ipc_labelh_t lh); +ipc_labelh_t labelh_reference(ipc_labelh_t lh); +void lh_free(ipc_labelh_t lh); -#define lh_reference(lh) ((lh)->lh_references++) +#define lh_reference(lh) ((lh)->lh_references++) #define lh_release(lh) \ MACRO_BEGIN \ - assert ((lh)->lh_references > 0); \ + assert((lh)->lh_references > 0); \ (lh)->lh_references--; \ MACRO_END From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:18:13 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 6981616A423; Thu, 23 Feb 2006 19:18:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CCED16A420 for ; Thu, 23 Feb 2006 19:18:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1ACC43D49 for ; Thu, 23 Feb 2006 19:18:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJICFZ015000 for ; Thu, 23 Feb 2006 19:18:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJICad014997 for perforce@freebsd.org; Thu, 23 Feb 2006 19:18:12 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:18:12 GMT Message-Id: <200602231918.k1NJICad014997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92283 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, 23 Feb 2006 19:18:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92283 Change 92283 by millert@millert_g4tower on 2006/02/23 19:17:28 Use labelh_new_user() in mac_request_label(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -223,10 +223,8 @@ { ipc_entry_t subi, obji; ipc_object_t subp, objp; - ipc_labelh_t outlh; - ipc_port_t sport; kern_return_t kr; - struct label *objl, *subl; + struct label *objl, *subl, outl; int rc; if (space == IS_NULL || space->is_task == NULL) @@ -242,8 +240,6 @@ objp = obji->ie_object; subp = subi->ie_object; - outlh = labelh_new(); - ipc_port_multiple_lock(); /* serialize (not necessary for LH, but simpler) */ io_lock(objp); io_lock(subp); @@ -256,26 +252,31 @@ if (subl == NULL) goto errout; - mac_init_port_label(&outlh->lh_label); - rc = mac_request_object_label(subl, objl, serv, &outlh->lh_label); + mac_init_port_label(&outl); + rc = mac_request_object_label(subl, objl, serv, &outl); io_unlocklabel(subp); io_unlock(subp); io_unlocklabel(objp); io_unlock(objp); ipc_port_multiple_unlock(); - ip_lock(outlh->lh_port); - sport = ipc_port_make_send_locked(outlh->lh_port); - ip_release(outlh->lh_port); - ip_unlock(outlh->lh_port); - *outlabel = ipc_port_copyout_send(outlh->lh_port,space); + switch (rc) { + case 0: + kr = labelh_new_user(space, &outl, outlabel); + break; + case 22: + /* EINVAL */ + kr = KERN_INVALID_ARGUMENT; + break; + default: + kr = KERN_NO_ACCESS; + break; + } + + if (kr != KERN_SUCCESS) + mac_destroy_port_label(&outl); - if (rc == /*EINVAL*/ 22) - return KERN_INVALID_ARGUMENT; - else if (rc != 0) - return KERN_NO_ACCESS; - else - return 0; + return kr; errout: io_unlocklabel(subp); @@ -283,6 +284,5 @@ io_unlocklabel(objp); io_unlock(objp); ipc_port_multiple_unlock(); - labelh_release(outlh); return KERN_INVALID_ARGUMENT; } From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:19: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 09B7216A423; Thu, 23 Feb 2006 19:19:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2D9116A420 for ; Thu, 23 Feb 2006 19:19:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F43C43D46 for ; Thu, 23 Feb 2006 19:19:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJJEaK015026 for ; Thu, 23 Feb 2006 19:19:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJJE7J015023 for perforce@freebsd.org; Thu, 23 Feb 2006 19:19:14 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:19:14 GMT Message-Id: <200602231919.k1NJJE7J015023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92284 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, 23 Feb 2006 19:19:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=92284 Change 92284 by millert@millert_g4tower on 2006/02/23 19:19:13 Convert some if() else to switch(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#4 (text+ko) ==== @@ -87,12 +87,16 @@ rc = mac_check_service_access(&subjl, &objl, serv, perm); mac_destroy_task_label(&subjl); mac_destroy_task_label(&objl); - if (rc == /*EINVAL*/ 22) + + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } } kern_return_t @@ -143,12 +147,15 @@ io_unlock (objp); mac_destroy_task_label(&subjl); - if (rc == /*EINVAL*/ 22) + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } } kern_return_t @@ -197,12 +204,15 @@ io_unlock(objp); ipc_port_multiple_unlock(); - if (rc == /*EINVAL*/ 22) + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } errout: io_unlocklabel(subp); From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:22: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 6C3E916A423; Thu, 23 Feb 2006 19:22:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1858E16A420 for ; Thu, 23 Feb 2006 19:22:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D166743D46 for ; Thu, 23 Feb 2006 19:22:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJMIaM015246 for ; Thu, 23 Feb 2006 19:22:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJMIXl015243 for perforce@freebsd.org; Thu, 23 Feb 2006 19:22:18 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:22:18 GMT Message-Id: <200602231922.k1NJMIXl015243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92285 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, 23 Feb 2006 19:22:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92285 Change 92285 by millert@millert_g4tower on 2006/02/23 19:21:40 Add 2 new methods to the security server: mach_get_task_label() which gets the label handle of a task and mach_get_label() which allocates a new label handle and copies a port's label into it. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#5 (text+ko) ==== @@ -1760,6 +1760,47 @@ return kr; } +/* + * Get a label handle representing the given port's port label. + */ +kern_return_t +mach_get_label( + ipc_space_t space, + mach_port_name_t name, + mach_port_name_t *outlabel) +{ + ipc_entry_t entry; + ipc_port_t port; + struct label outl; + kern_return_t kr; + + if (!MACH_PORT_VALID(name)) + return KERN_INVALID_NAME; + + /* Lookup the port name in the task's space. */ + kr = ipc_right_lookup_write(space, name, &entry); + if (kr != KERN_SUCCESS) + return kr; + + /* Make sure we are not dealing with a label handle. */ + port = (ipc_port_t) entry->ie_object; + ip_lock(port); + is_write_unlock(space); + if (ip_kotype(port) == IKOT_LABELH) { + /* already is a label handle! */ + ip_unlock(port); + return KERN_INVALID_ARGUMENT; + } + + /* Copy the port label and stash it in a new label handle. */ + mac_init_port_label(&outl); + mac_copy_port_label(&port->ip_label, &outl); + kr = labelh_new_user(space, &outl, outlabel); + ip_unlock(port); + + return KERN_SUCCESS; +} + /* also works on label handles */ kern_return_t ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#5 (text+ko) ==== @@ -31,6 +31,32 @@ #include kern_return_t +mach_get_task_label( + task_t t, + mach_port_name_t *outlabel) +{ + ipc_labelh_t lh = t->label; + ipc_space_t space = t->itk_space; + kern_return_t kr; + + ip_lock(lh->lh_port); + lh->lh_port->ip_mscount++; + lh->lh_port->ip_srights++; + ip_reference(lh->lh_port); + ip_unlock(lh->lh_port); + kr = ipc_object_copyout(space, lh->lh_port, + MACH_MSG_TYPE_PORT_SEND, 0, outlabel); + if (kr != KERN_SUCCESS) { + ip_lock(lh->lh_port); + ip_release(lh->lh_port); + ip_check_unlock(lh->lh_port); + *outlabel = MACH_PORT_NULL; + } + + return (KERN_SUCCESS); +} + +kern_return_t mach_get_task_label_text( task_t t, labelstr_t policies, ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#6 (text+ko) ==== @@ -13,6 +13,20 @@ type labelstr_t = c_string[*:512]; /** + @brief Retrieve a task label as a label handle + @param task Target's task port + @param label Returned label handle + + This call retrieves a label handle label for the + specified task, with respect to the specified policies. + + @return Standard MiG return values (0 for success) +*/ + +routine mach_get_task_label(task : task_t; + out label : mach_port_name_t); + +/** @brief Retrieve a task label in textual form @param task Target's task port @param policies Comma-delimited list of policies to query @@ -29,6 +43,26 @@ out label : labelstr_t); /** + @brief Retrieve a port label as a label handle + @param task Issuer's task port + @param port Port to query label from + @param label Returned label handle + + This call retrieves a label handle label for the + specified task, with respect to the specified policies. + + This call retrieves a label handle for the specified port, with + respect to the specified policies. If the port represents a label + handle, KERN_INVALID_ARGUMENT is returned. + + @return Standard MiG return values (0 for success) +*/ + +routine mach_get_label(task : ipc_space_t; + port : mach_port_name_t; + out label : mach_port_name_t); + +/** @brief Retrieve a port label in textual form @param task Issuer's task port @param name Port to query label from From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:23:21 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 1FB2C16A423; Thu, 23 Feb 2006 19:23:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A1416A420 for ; Thu, 23 Feb 2006 19:23:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F5DA43D46 for ; Thu, 23 Feb 2006 19:23:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJNKs9015294 for ; Thu, 23 Feb 2006 19:23:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJNK7R015291 for perforce@freebsd.org; Thu, 23 Feb 2006 19:23:20 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:23:20 GMT Message-Id: <200602231923.k1NJNK7R015291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92286 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, 23 Feb 2006 19:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=92286 Change 92286 by millert@millert_g4tower on 2006/02/23 19:22:55 Simple label handle exerciser. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:33:35 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 503FA16A423; Thu, 23 Feb 2006 19:33:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F376516A420 for ; Thu, 23 Feb 2006 19:33:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEAFB43D5E for ; Thu, 23 Feb 2006 19:33:33 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJXXA9015798 for ; Thu, 23 Feb 2006 19:33:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJXXJx015792 for perforce@freebsd.org; Thu, 23 Feb 2006 19:33:33 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:33:33 GMT Message-Id: <200602231933.k1NJXXJx015792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92288 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, 23 Feb 2006 19:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92288 Change 92288 by millert@millert_g4tower on 2006/02/23 19:33:16 Update errata list Affected files ... .. //depot/projects/trustedbsd/sedarwin7/ERRATA#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/ERRATA#3 (text+ko) ==== @@ -1,8 +1,8 @@ -Port of TrustedBSD MAC Framework to Darwin 10.3.3 +Port of TrustedBSD MAC Framework to Darwin 10.3.8 -McAfee Research -15204 Omega Drive, Suite 300 -Rockville, MD 20850 +SPARTA, Inc. +7075 Samuel Morse Drive +Columbia, MD 21046-3401 The following known issues are present in this release: @@ -28,15 +28,24 @@ provides /dev/fd entries on darwin instead of implementing this within devfs. - 66: Panic with a zalloc: the ipctrace seems to be leaking memory with - port labels and the system will panic after a running for a while. - 76: If a filesystem makes symbolic links from a partition that is using extended attributes into a file system that is not using extended attributes, the system will eventually deadlock. + 89: SEDarwin policy rejecting access to /dev/null when it should + not. Is the general_file_write_access macro not being applied + to users? + 91: Users who create and attach new disk images cannot then access them. + 93: After reboot, the first time a user logs in, after entering correct + user name and password an alert pops up that says: + You cannot continue logging in at this time. There is a + problem that prevents you from logging in at this time. + Please contact your system administrator for help. + After clicking OK the MAC login plug-in box comes up and the + user may login normally. + 98: HFS+ ignores mac_associate_vnode_extattr() failure. HFS+ currently ignores failures in mac_associate_vnode_extattr(), so a failure to load critical extended attributes by a policy might @@ -72,7 +81,16 @@ VOP_IOCTL vector. A MAC Framework access control check needs to be inserted here. -147: Panic with a bad v_usecount for a vnode during vnreclaim(). This - occurs under a heavy load of combined auditing and file - operations. The stack trace always reflects a problem in the - lstat() system call. It's possible that this is a vendor defect. +238: Currently the port label of a label handle is unused. This + could (and probably should) be used to implement access control + (label visibility). The port label would start out with the + same value as the object label but we should provide methods + to get/set this label. Security server methods that return a + label handle or text label can use the port label for access + control. + +239: The SLOT() macro may return NULL in the SEDarwin policy. This + causes a panic in sebsd_externalize_cred_label() when the port + that holds the label has already been destroyed. There appears + to be a missing lock or out of order operation since we should + not be trying to externalized a dead port. From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:35: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 6A20216A423; Thu, 23 Feb 2006 19:35:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1563C16A422 for ; Thu, 23 Feb 2006 19:35:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D15143D79 for ; Thu, 23 Feb 2006 19:35:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJZa1V015957 for ; Thu, 23 Feb 2006 19:35:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJZaH4015954 for perforce@freebsd.org; Thu, 23 Feb 2006 19:35:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:35:36 GMT Message-Id: <200602231935.k1NJZaH4015954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92289 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, 23 Feb 2006 19:35:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92289 Change 92289 by millert@millert_g4tower on 2006/02/23 19:34:48 Don't overwrite /etc/xinetd.d/ssh Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 (text+ko) ==== @@ -62,8 +62,8 @@ $(_v) rmdir $(DSTROOT)/etc install-startup-item: - $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d - $(_v) $(INSTALL_FILE) -c ssh-via-xinetd $(DSTROOT)/private/etc/xinetd.d/ssh + #$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d + #$(_v) $(INSTALL_FILE) -c ssh-via-xinetd $(DSTROOT)/private/etc/xinetd.d/ssh $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/usr/libexec $(_v) $(INSTALL_FILE) -m 555 -c sshd-keygen-wrapper $(DSTROOT)/usr/libexec/sshd-keygen-wrapper From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:41:46 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 18D0E16A423; Thu, 23 Feb 2006 19:41:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B641416A420 for ; Thu, 23 Feb 2006 19:41:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F98143D4C for ; Thu, 23 Feb 2006 19:41:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJfjtZ016237 for ; Thu, 23 Feb 2006 19:41:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJfjFc016234 for perforce@freebsd.org; Thu, 23 Feb 2006 19:41:45 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:41:45 GMT Message-Id: <200602231941.k1NJfjFc016234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92291 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, 23 Feb 2006 19:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=92291 Change 92291 by millert@millert_g4tower on 2006/02/23 19:41:12 Remove the VOP_READDIRATTR() workaround and just disable VOP_READDIRATTR() support in HFS altogether. Instantiating all the vnodes for a directory negates any performance gain VOP_READDIRATTR() gives us so we are better off without it. Obtained from DSEP. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/hfs/hfs_attrlist.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/hfs/hfs_attrlist.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ * @APPLE_LICENSE_HEADER_END@ */ /* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -662,7 +661,6 @@ struct cat_desc prevdesc; char * prevnamebuf = NULL; struct cat_entrylist *ce_list = NULL; - int no_vnode_count = 0; dir_entries = dcp->c_entries; if (dcp->c_attr.ca_fileid == kHFSRootFolderID && hfsmp->jnl) { @@ -671,6 +669,11 @@ *(ap->a_actualcount) = 0; *(ap->a_eofflag) = 0; + +#ifdef MAC + printf("WARNING: hfs_vnop_readdirattr is not supported with a MAC-enabled kernel\n"); + return (ENOTSUP); +#endif if (ap->a_cookies != NULL) { printf("readdirattr: no cookies!\n"); @@ -771,8 +774,6 @@ struct cat_attr * cattrp; struct cat_fork c_datafork = {0}; struct cat_fork c_rsrcfork = {0}; - struct cat_attr cattrtmp; - int mperm; cdescp = &ce_list->entry[i].ce_desc; cattrp = &ce_list->entry[i].ce_attr; @@ -783,34 +784,8 @@ /* * Get in memory cnode data (if any). */ - mperm = 0; -#ifdef MAC - /*- - * Normally, HFS+ will not generate catalog entries - * when performing VOP_READDIRATTR() so as to avoid - * the overhead. However, we perform MAC checks - * using vnode labels, so we must force vnodes to be - * instantiated. - * - * XXXMAC: We should probably generate an assertion - * failure if we're unable to instantiate a vnode - * for an entry. - */ - if (1) { - error = hfs_getcnode(hfsmp, cattrp->ca_fileid, NULL, 0, NULL, NULL, &vp); - if (error) { - printf("hfs_readdirattr(): warning got %d\n", error); - cp = hfs_chashget(dcp->c_dev, cattrp->ca_fileid, 0, &vp, &rvp); - } else { - mperm = mac_check_vnode_stat(current_proc()->p_ucred, ap->a_cred, vp); - - cp = vp->v_data; - rvp = NULL; - } -#else if (!(ap->a_options & FSOPT_NOINMEMUPDATE)) { cp = hfs_chashget(dcp->c_dev, cattrp->ca_fileid, 0, &vp, &rvp); -#endif if (cp != NULL) { /* Only use cnode's decriptor for non-hardlinks */ if (!(cp->c_flag & C_HARDLINK)) @@ -826,27 +801,6 @@ } } } - /*- - * XXXMAC: In order to return the right number of - * entries in the catalog buffer, we fill in a - * dummy entry in the stack for files that the - * caller is not allowed to retrieve attributes for. - * If we don't return the right number of entries, - * applications (such as Finder) behave badly. - * - * XXXMAC: We leave all fields zero'd except the - * minimum necessary to make Finder behave - * correctly, which includes the fileid, mode, - * and a link count. - */ - if (mperm) { - bzero (&cattrtmp, sizeof (struct cat_attr)); - cattrtmp.ca_fileid = cattrp->ca_fileid; - cattrtmp.ca_mode = cattrp->ca_mode & ~07777; - cattrtmp.ca_nlink = 1; - cattrp = &cattrtmp; - } - *((u_long *)attrptr)++ = 0; /* move it past length */ attrblk.ab_attrlist = alist; attrblk.ab_attrbufpp = &attrptr; @@ -860,8 +814,6 @@ currattrbufsize = ((char *)varptr - (char *)attrbufptr); /* All done with cnode. */ - if (vp == NULL && rvp == NULL) - no_vnode_count++; if (vp) { vput(vp); vp = NULL; @@ -943,9 +895,6 @@ if (prevnamebuf) FREE(prevnamebuf, M_TEMP); - if (no_vnode_count != 0) - printf("hfs_readdirattr: no_vnode_count of %d\n", no_vnode_count); - return (error); } @@ -1074,36 +1023,6 @@ } /* - * XXXMAC: Utility function to determine what access rights the subject - * has to a vnode, as expressed in UNIX file access permissions. Test - * each of read, write, and execute using discretionary and mandatatory - * checks. Note that this function reveals information about access - * protections that stat() is normally not permitted to reveal about a - * file if the access check for stat() fails. We may need to revisit - * this if there is a requirement for hiding protection information for - * objects that can be named but not inspected. - */ -#ifdef MAC -static int -access_all(struct vnode *vp, struct proc *p) -{ - int r; - - r = 0; - if (VOP_ACCESS(vp, VREAD, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VREAD) == 0) - r |= R_OK; - if (VOP_ACCESS(vp, VWRITE, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VWRITE) == 0) - r |= W_OK; - if (VOP_ACCESS (vp, VEXEC, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VEXEC) == 0) - r |= X_OK; - return r; -} -#endif - -/* * Pack common volume attributes. */ static void @@ -1229,17 +1148,8 @@ } if (ATTR_CMN_USERACCESS & attr) { *((u_long *)attrbufptr)++ = -#ifdef MAC - /* - * If we could retrieve a vnode, calculate the permission - * summary based on DAC and MAC checks. - * XXXMAC: Need to handle (vp == NULL) better here, - * probably via an assertion failure. - */ - vp != NULL ? access_all(vp, current_proc()) : -#endif - DerivePermissionSummary(cp->c_uid, cp->c_gid, cp->c_mode, - VTOVFS(vp), current_proc()->p_ucred, current_proc()); + DerivePermissionSummary(cp->c_uid, cp->c_gid, cp->c_mode, + VTOVFS(vp), current_proc()->p_ucred, current_proc()); } *abp->ab_attrbufpp = attrbufptr; @@ -1388,7 +1298,13 @@ VOL_CAP_INT_SEARCHFS | VOL_CAP_INT_ATTRLIST | VOL_CAP_INT_NFSEXPORT | +/* + * We will not support this operation due to complexity and the + * run-time costs of accessing vnode labels. + */ +#ifndef MAC VOL_CAP_INT_READDIRATTR | +#endif VOL_CAP_INT_EXCHANGEDATA | VOL_CAP_INT_ALLOCATE | VOL_CAP_INT_VOL_RENAME | @@ -1413,7 +1329,13 @@ VOL_CAP_INT_SEARCHFS | VOL_CAP_INT_ATTRLIST | VOL_CAP_INT_NFSEXPORT | +/* + * We will not support this operation due to complexity and the + * run-time costs of accessing vnode labels. + */ +#ifndef MAC VOL_CAP_INT_READDIRATTR | +#endif VOL_CAP_INT_EXCHANGEDATA | VOL_CAP_INT_COPYFILE | VOL_CAP_INT_ALLOCATE | @@ -1577,18 +1499,9 @@ } if (ATTR_CMN_USERACCESS & attr) { *((u_long *)attrbufptr)++ = -#ifdef MAC - /* - * If we could retrieve a vnode, calculate the permission - * summary based on DAC and MAC checks. - * XXXMAC: Need to handle (vp == NULL) better here, - * probably via an assertion failure. - */ - vp != NULL ? access_all(vp, current_proc()) : -#endif - DerivePermissionSummary(cap->ca_uid, cap->ca_gid, - cap->ca_mode, mp, current_proc()->p_ucred, - current_proc()); + DerivePermissionSummary(cap->ca_uid, cap->ca_gid, + cap->ca_mode, mp, current_proc()->p_ucred, + current_proc()); } *abp->ab_attrbufpp = attrbufptr; From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:43: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 4120A16A424; Thu, 23 Feb 2006 19:43:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0F5F16A420 for ; Thu, 23 Feb 2006 19:43:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6828D43D46 for ; Thu, 23 Feb 2006 19:43:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJhmAA016393 for ; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJhmwg016390 for perforce@freebsd.org; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 19:43:48 GMT Message-Id: <200602231943.k1NJhmwg016390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92292 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, 23 Feb 2006 19:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92292 Change 92292 by rwatson@rwatson_fledge on 2006/02/23 19:43:01 Add trustedbsd-audit mailing list references on the two audit-related web pages. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#2 edit .. //depot/projects/trustedbsd/www/openbsm.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#1 $ + $P4: //depot/projects/trustedbsd/www/audit.page#2 $ @@ -71,6 +71,10 @@ Apple's Mac OS X, Solaris, and Linux, and permits the writing of portable audit-related applications.

    +

    Discussion of the TrustedBSD Audit implementation, as well as the + OpenBSM package, takes place on the trustedbsd-audit mailing list.

    +

    The TrustedBSD Project greatfully acknowledges Apple Computer, Inc., for its generous donation of the Darwin audit implementation under a BSD license.

    ==== //depot/projects/trustedbsd/www/openbsm.page#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#4 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#5 $ @@ -71,6 +71,10 @@ as integration of audit into the FreeBSD CVS tree is largely complete.

    +

    Discussion of the TrustedBSD Audit implementation, as well as the + OpenBSM package, takes place on the trustedbsd-audit mailing list.

    +

    OpenBSM is derived from the BSM audit implementation found in Apple's open source Darwin operating system, generously released by Apple under a BSD license. The Darwin BSM implementation was From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:43: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 A72EE16A427; Thu, 23 Feb 2006 19:43:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 260DD16A422 for ; Thu, 23 Feb 2006 19:43:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B713243D4C for ; Thu, 23 Feb 2006 19:43:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJhmjt016399 for ; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJhm5m016396 for perforce@freebsd.org; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:43:48 GMT Message-Id: <200602231943.k1NJhm5m016396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92293 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, 23 Feb 2006 19:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92293 Change 92293 by millert@millert_g4tower on 2006/02/23 19:43:34 Revert to vendor source. MACH_PORT_TYPE_LABELH and MACH_PORT_RIGHT_LABELH are relics of the old label handle implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/port.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/port.h#3 (text+ko) ==== @@ -48,12 +48,6 @@ * the rights to redistribute these changes. */ /* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce - * support for mandatory and extensible security protections. This notice - * is included in support of clause 2.2 (b) of the Apple Public License, - * Version 2.0. - */ -/* */ /* * File: mach/port.h @@ -198,8 +192,7 @@ #define MACH_PORT_RIGHT_SEND_ONCE ((mach_port_right_t) 2) #define MACH_PORT_RIGHT_PORT_SET ((mach_port_right_t) 3) #define MACH_PORT_RIGHT_DEAD_NAME ((mach_port_right_t) 4) -#define MACH_PORT_RIGHT_LABELH ((mach_port_right_t) 5) -#define MACH_PORT_RIGHT_NUMBER ((mach_port_right_t) 6) +#define MACH_PORT_RIGHT_NUMBER ((mach_port_right_t) 5) typedef natural_t mach_port_type_t; typedef mach_port_type_t *mach_port_type_array_t; @@ -213,7 +206,6 @@ #define MACH_PORT_TYPE_SEND_ONCE MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND_ONCE) #define MACH_PORT_TYPE_PORT_SET MACH_PORT_TYPE(MACH_PORT_RIGHT_PORT_SET) #define MACH_PORT_TYPE_DEAD_NAME MACH_PORT_TYPE(MACH_PORT_RIGHT_DEAD_NAME) -#define MACH_PORT_TYPE_LABELH MACH_PORT_TYPE(MACH_PORT_RIGHT_LABELH) /* Convenient combinations. */ From owner-p4-projects@FreeBSD.ORG Thu Feb 23 19:49: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 117BA16A423; Thu, 23 Feb 2006 19:49:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C821816A420 for ; Thu, 23 Feb 2006 19:49:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EF4D43D45 for ; Thu, 23 Feb 2006 19:49:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJnuTM016640 for ; Thu, 23 Feb 2006 19:49:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJnuAW016637 for perforce@freebsd.org; Thu, 23 Feb 2006 19:49:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 19:49:56 GMT Message-Id: <200602231949.k1NJnuAW016637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92294 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, 23 Feb 2006 19:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=92294 Change 92294 by rwatson@rwatson_fledge on 2006/02/23 19:49:07 Mention OpenBSM release on news page. Affected files ... .. //depot/projects/trustedbsd/www/news.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#5 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#4 $ + $P4: //depot/projects/trustedbsd/www/news.page#5 $ @@ -47,6 +47,14 @@ Project.

    +
    February 23, 2006 OpenBSM 1.0 alpha 4 release
    + +

    Robert Watson announces the availability of the OpenBSM 1.0 + alpha 4 release on the OpenBSM web + page. This is the OpenBSM version currently integrated into the + FreeBSD 7.x audit implementation, and is being made available as + a tarball to make it more accessable to non-FreeBSD users.

    +
    February 7, 2006 TrustedBSD mailing lists moving to FreeBSD mailman server
    From owner-p4-projects@FreeBSD.ORG Thu Feb 23 20:10: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 B916C16A424; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 636EF16A420 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1930243D45 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NKAMbZ017490 for ; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKALJQ017487 for perforce@freebsd.org; Thu, 23 Feb 2006 20:10:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:10:21 GMT Message-Id: <200602232010.k1NKALJQ017487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92296 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, 23 Feb 2006 20:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92296 Change 92296 by millert@millert_g4tower on 2006/02/23 20:09:32 Rename sebsd_loadpolicy -> loadpolicy Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.8#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 23 20:10: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 09ED816A426; Thu, 23 Feb 2006 20:10:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E44C16A422 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 675B543D45 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NKAMVO017496 for ; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKAMDP017493 for perforce@freebsd.org; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:10:22 GMT Message-Id: <200602232010.k1NKAMDP017493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92297 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, 23 Feb 2006 20:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92297 Change 92297 by millert@millert_g4tower on 2006/02/23 20:10:02 Update for loadpolicy name change. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#5 (text+ko) ==== @@ -1,9 +1,9 @@ include ../../../Makeconfig -PROG= sebsd_loadpolicy -MAN8= sebsd_loadpolicy.8 +PROG= loadpolicy +MAN8= loadpolicy.8 -OBJS= sebsd_loadpolicy.o +OBJS= loadpolicy.o CFLAGS+= -Wall -I$(SOURCE_ROOT)/sedarwin ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#2 (text+ko) ==== @@ -31,19 +31,19 @@ .\" .\" $FreeBSD: $ .Dd December 28, 2005 -.Dt SEBSD_LOADPOLICY 8 +.Dt LOADPOLICY 8 .Os .Sh NAME -.Nm sebsd_loadpolicy -.Nd Re-load the sebsd policy +.Nm loadpolicy +.Nd Re-load the SEDarwin policy .Sh SYNOPSIS -.Nm sebsd_loadpolicy +.Nm loadpolicy .Op Fl m Ar migscsfile .Ar policy_file .Sh DESCRIPTION The -.Nm sebsd_loadpolicy -utility loads a new security policy for the SEBSD module. +.Nm loadpolicy +utility loads a new security policy for the SEDarwin module. The new policy file is specified in .Ar policy_file . .Pp ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#2 (text+ko) ==== @@ -71,8 +71,6 @@ void usage(void) { - extern char *__progname; - - fprintf(stderr, "usage: %s [-m migscs_file] policy_file\n", __progname); + fprintf(stderr, "usage: loadpolicy [-m migscs_file] policy_file\n"); exit(1); } From owner-p4-projects@FreeBSD.ORG Thu Feb 23 20:11:25 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 A9F8B16A423; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F6CC16A420 for ; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25DC743D46 for ; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NKBOro017527 for ; Thu, 23 Feb 2006 20:11:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKBNMD017524 for perforce@freebsd.org; Thu, 23 Feb 2006 20:11:23 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:11:23 GMT Message-Id: <200602232011.k1NKBNMD017524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92298 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, 23 Feb 2006 20:11:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92298 Change 92298 by millert@millert_g4tower on 2006/02/23 20:11:06 Rename sebsd_newrole -> newrole Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.1#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 23 20:12: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 7661516A423; Thu, 23 Feb 2006 20:12:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38F9F16A420 for ; Thu, 23 Feb 2006 20:12:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD05343D45 for ; Thu, 23 Feb 2006 20:12:25 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NKCPpC017670 for ; Thu, 23 Feb 2006 20:12:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKCPAv017667 for perforce@freebsd.org; Thu, 23 Feb 2006 20:12:25 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:12:25 GMT Message-Id: <200602232012.k1NKCPAv017667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92299 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, 23 Feb 2006 20:12:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92299 Change 92299 by millert@millert_g4tower on 2006/02/23 20:11:32 Update to reflect newrole name change. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 (text+ko) ==== @@ -1,9 +1,9 @@ include ../../../Makeconfig -PROG= sebsd_newrole -MAN1= sebsd_newrole.1 +PROG= newrole +MAN1= newrole.1 -OBJS= sebsd_newrole.o +OBJS= newrole.o CFLAGS+= $(DARWIN_HDRS) CFLAGS+= -I$(SOURCE_ROOT)/sedarwin ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 (text+ko) ==== @@ -30,18 +30,18 @@ .\" .\" $FreeBSD: $ .Dd August 27, 2003 -.Dt SEBSD_NEWROLE 1 +.Dt NEWROLE 1 .Os .Sh NAME -.Nm sebsd_newrole +.Nm newrole .Nd run a shell with a new role .Sh SYNOPSIS -.Nm sebsd_newrole +.Nm newrole .Ar ... .Sh DESCRIPTION The -.Nm sebsd_newrole +.Nm newrole utility runs a new shell in a new security context. The new context is derived from the old context in which -.Ar sebsd_newrole +.Ar newrole is originally executed. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -#define SEBSD_SERVICE_NAME "sebsd_newrole" +#define SERVICE_NAME "newrole" extern char **environ; @@ -68,7 +68,7 @@ NULL }; - error = pam_start(SEBSD_SERVICE_NAME, pw->pw_name, &pam_conversation, + error = pam_start(SERVICE_NAME, pw->pw_name, &pam_conversation, &pam_handle); if (error != PAM_SUCCESS) { fprintf(stderr, "Error, failed to initialize PAM\n"); @@ -102,8 +102,8 @@ mac_t execlabel; if (!sebsd_enabled()) { - fprintf(stderr, "Sorry, sebsd_newrole may only be used when " - "the SEBSD security module is loaded\n"); + fprintf(stderr, "Sorry, newrole may only be used when " + "the SEDarwin security module is loaded\n"); exit(1); } @@ -231,6 +231,6 @@ usage(void) { - fprintf(stderr, "usage: sebsd_newrole -r role [ -t type ] [ args ]\n"); + fprintf(stderr, "usage: newrole -r role [ -t type ] [ args ]\n"); exit(1); } From owner-p4-projects@FreeBSD.ORG Thu Feb 23 23:37:35 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 037DD16A423; Thu, 23 Feb 2006 23:37:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B438D16A420 for ; Thu, 23 Feb 2006 23:37:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B96643D45 for ; Thu, 23 Feb 2006 23:37:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NNbYO0032539 for ; Thu, 23 Feb 2006 23:37:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NNbYwa032536 for perforce@freebsd.org; Thu, 23 Feb 2006 23:37:34 GMT (envelope-from marcel@freebsd.org) Date: Thu, 23 Feb 2006 23:37:34 GMT Message-Id: <200602232337.k1NNbYwa032536@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 92304 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, 23 Feb 2006 23:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92304 Change 92304 by marcel@marcel_nfs on 2006/02/23 23:37:12 We don't need to compile serdev_if.m if uart(4) is configured. uart(4) needs it if scc(4) is configured, which is also when we compile serdev_if.m. Affected files ... .. //depot/projects/uart/conf/files#49 edit Differences ... ==== //depot/projects/uart/conf/files#49 (text+ko) ==== @@ -1316,7 +1316,6 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m optional scc -kern/serdev_if.m optional uart kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard From owner-p4-projects@FreeBSD.ORG Thu Feb 23 23:46: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 1CA3D16A438; Thu, 23 Feb 2006 23:46:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF19D16A420 for ; Thu, 23 Feb 2006 23:46:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BAC843D46 for ; Thu, 23 Feb 2006 23:46:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NNkkCO032978 for ; Thu, 23 Feb 2006 23:46:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NNkkFE032975 for perforce@freebsd.org; Thu, 23 Feb 2006 23:46:46 GMT (envelope-from marcel@freebsd.org) Date: Thu, 23 Feb 2006 23:46:46 GMT Message-Id: <200602232346.k1NNkkFE032975@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 92306 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, 23 Feb 2006 23:46:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=92306 Change 92306 by marcel@marcel_nfs on 2006/02/23 23:46:10 Have puc(4) return BUS_PROBE_LOW_PRIORITY for the SCCs it's currently handling and have scc(4) return BUS_PROBE_DEFAULT. This allows both puc(4) and scc(4) to be configured, as well as have scc(4) play nice with possible vendor drivers. Affected files ... .. //depot/projects/uart/dev/puc/puc_ebus.c#10 edit .. //depot/projects/uart/dev/puc/puc_sbus.c#11 edit .. //depot/projects/uart/dev/scc/scc_core.c#9 edit Differences ... ==== //depot/projects/uart/dev/puc/puc_ebus.c#10 (text+ko) ==== @@ -54,7 +54,7 @@ cmpt = ofw_bus_get_compat(dev); if (!strcmp(nm, "se") || (cmpt != NULL && !strcmp(cmpt, "sab82532"))) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } return (ENXIO); } ==== //depot/projects/uart/dev/puc/puc_sbus.c#11 (text+ko) ==== @@ -53,7 +53,7 @@ nm = ofw_bus_get_name(dev); if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_core.c#9 (text+ko) ==== @@ -338,7 +338,7 @@ error = SCC_PROBE(sc); bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); - return (error); + return ((error == 0) ? BUS_PROBE_DEFAULT : error); } struct resource * From owner-p4-projects@FreeBSD.ORG Fri Feb 24 01:29:52 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 41B4216A423; Fri, 24 Feb 2006 01:29:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2C7F16A420 for ; Fri, 24 Feb 2006 01:29:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABA3343D48 for ; Fri, 24 Feb 2006 01:29:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O1TpjW043928 for ; Fri, 24 Feb 2006 01:29:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O1Tpu2043925 for perforce@freebsd.org; Fri, 24 Feb 2006 01:29:51 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Feb 2006 01:29:51 GMT Message-Id: <200602240129.k1O1Tpu2043925@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 92309 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, 24 Feb 2006 01:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92309 Change 92309 by imp@imp_Speedy on 2006/02/24 01:29:04 Export clock management functionality. Turn on ohci clocks in its attach routine, turn them off in the detach. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#10 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmcvar.h#1 add .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#10 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include static struct at91_pmc_softc { bus_space_tag_t sc_st; @@ -54,20 +55,6 @@ uint32_t pllb_init; } *pmc_softc; -struct at91_pmc_clock -{ - const char *name; - uint32_t hz; - struct at91_pmc_clock *parent; - uint32_t pmc_mask; - void (*set_mode)(struct at91_pmc_clock *, int); - uint32_t refcnt; - unsigned id:2; - unsigned primary:1; - unsigned pll:1; - unsigned programmable:1; -}; - static void at91_pmc_set_pllb_mode(struct at91_pmc_clock *, int); static void at91_pmc_set_sys_mode(struct at91_pmc_clock *, int); static void at91_pmc_set_periph_mode(struct at91_pmc_clock *, int); @@ -101,7 +88,7 @@ static struct at91_pmc_clock pllb = { .name = "pllb", // PLLB Clock, used for USB functions .parent = &main_ck, - .refcnt = 1, + .refcnt = 0, .id = 0, .primary = 1, .pll = 1, @@ -170,18 +157,72 @@ static void at91_pmc_set_pllb_mode(struct at91_pmc_clock *clk, int on) { + struct at91_pmc_softc *sc = pmc_softc; + uint32_t value; + + if (on) { + on = PMC_IER_LOCKB; + value = sc->pllb_init; + } else { + value = 0; + } + WR4(sc, CKGR_PLLBR, value); + while ((RD4(sc, PMC_SR) & PMC_IER_LOCKB) != on) + continue; } static void at91_pmc_set_sys_mode(struct at91_pmc_clock *clk, int on) { + struct at91_pmc_softc *sc = pmc_softc; + + WR4(sc, on ? PMC_SCER : PMC_SCDR, clk->pmc_mask); } static void at91_pmc_set_periph_mode(struct at91_pmc_clock *clk, int on) { + struct at91_pmc_softc *sc = pmc_softc; + + WR4(sc, on ? PMC_PCER : PMC_PCDR, clk->pmc_mask); +} + +struct at91_pmc_clock * +at91_pmc_clock_ref(const char *name) +{ + int i; + + /* XXX LOCKING? XXX */ + for (i = 0; i < sizeof(clock_list) / sizeof(clock_list[0]); i++) + if (strcmp(name, clock_list[i]->name) == 0) + return (clock_list[i]); + + return (NULL); +} + +void +at91_pmc_clock_deref(struct at91_pmc_clock *clk) +{ +} + +void +at91_pmc_clock_enable(struct at91_pmc_clock *clk) +{ + if (clk->parent) + at91_pmc_clock_enable(clk->parent); + if (clk->refcnt++ == 0 && clk->set_mode) + clk->set_mode(clk, 1); } +void +at91_pmc_clock_disable(struct at91_pmc_clock *clk) +{ + if (--clk->refcnt == 0 && clk->set_mode) + clk->set_mode(clk, 0); + if (clk->parent) + at91_pmc_clock_disable(clk->parent); +} + static int at91_pmc_pll_rate(int freq, uint32_t reg, int is_pllb) { @@ -197,7 +238,7 @@ } if (is_pllb && (reg & (1 << 28))) freq >>= 1; - return freq; + return (freq); } static uint32_t @@ -269,7 +310,6 @@ * this relationship. */ mckr = RD4(sc, PMC_MCKR); - printf("mckr is %x\n", mckr); mck.parent = clock_list[mckr & 0x3]; mck.parent->refcnt++; freq = mck.parent->hz; @@ -283,8 +323,6 @@ freq / 1000000, mck.hz / 1000000); WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); - /* XXX -- enable all PMC clocks */ - WR4(sc, PMC_PCER, 0xffffffff); /* Disable all interrupts for PMC */ WR4(sc, PMC_IDR, 0xffffffff); } ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#9 (text+ko) ==== @@ -43,11 +43,20 @@ #include #include +#include + #define MEM_RID 0 static int ohci_atmelarm_attach(device_t dev); static int ohci_atmelarm_detach(device_t dev); +struct at91_ohci_softc +{ + struct ohci_softc sc_ohci; + struct at91_pmc_clock *iclk; + struct at91_pmc_clock *fclk; +}; + static int ohci_atmelarm_probe(device_t dev) { @@ -58,47 +67,57 @@ static int ohci_atmelarm_attach(device_t dev) { - ohci_softc_t *sc = device_get_softc(dev); + struct at91_ohci_softc *sc = device_get_softc(dev); int err; int rid; - /* XXX need to enable clocks here, and some other stuff */ + + sc->iclk = at91_pmc_clock_ref("ohci_clk"); + sc->fclk = at91_pmc_clock_ref("uhpck"); rid = MEM_RID; - sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + sc->sc_ohci.io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (sc->io_res == NULL) { + if (sc->sc_ohci.io_res == NULL) { err = ENOMEM; goto error; } - sc->iot = rman_get_bustag(sc->io_res); - sc->ioh = rman_get_bushandle(sc->io_res); + sc->sc_ohci.iot = rman_get_bustag(sc->sc_ohci.io_res); + sc->sc_ohci.ioh = rman_get_bushandle(sc->sc_ohci.io_res); rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + sc->sc_ohci.irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->irq_res == NULL) { + if (sc->sc_ohci.irq_res == NULL) { err = ENOMEM; goto error; } - sc->sc_bus.bdev = device_add_child(dev, "usb", -1); - if (sc->sc_bus.bdev == NULL) { + sc->sc_ohci.sc_bus.bdev = device_add_child(dev, "usb", -1); + if (sc->sc_ohci.sc_bus.bdev == NULL) { err = ENOMEM; goto error; } - device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); + device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, - &sc->ih); + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, + &sc->sc_ohci.ih); if (err) { err = ENXIO; goto error; } - strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); - err = ohci_init(sc); + strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); + + /* + * turn on the clocks from the AT91's point of view. Keep the unit in reset. + */ + at91_pmc_clock_enable(sc->iclk); + at91_pmc_clock_enable(sc->fclk); + bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0); + + err = ohci_init(&sc->sc_ohci); if (!err) { - sc->sc_flags |= OHCI_SCFLG_DONEINIT; - err = device_probe_and_attach(sc->sc_bus.bdev); + sc->sc_ohci.sc_flags |= OHCI_SCFLG_DONEINIT; + err = device_probe_and_attach(sc->sc_ohci.sc_bus.bdev); } error:; @@ -112,30 +131,45 @@ static int ohci_atmelarm_detach(device_t dev) { - ohci_softc_t *sc = device_get_softc(dev); + struct at91_ohci_softc *sc = device_get_softc(dev); - if (sc->sc_flags & OHCI_SCFLG_DONEINIT) { - ohci_detach(sc, 0); - sc->sc_flags &= ~OHCI_SCFLG_DONEINIT; + if (sc->sc_ohci.sc_flags & OHCI_SCFLG_DONEINIT) { + ohci_detach(&sc->sc_ohci, 0); + sc->sc_ohci.sc_flags &= ~OHCI_SCFLG_DONEINIT; } - if (sc->ih) { - bus_teardown_intr(dev, sc->irq_res, sc->ih); - sc->ih = NULL; + /* + * Put the controller into reset, then disable clocks and do + * the MI tear down. We have to disable the clocks/hardware + * after we do the rest of the teardown. We also disable the + * clocks in the opposite order we acquire them, but that + * doesn't seem to be absolutely necessary. We free up the + * clocks after we disable them, so the system could, in + * theory, reuse them. + */ + bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0); + at91_pmc_clock_disable(sc->fclk); + at91_pmc_clock_disable(sc->iclk); + at91_pmc_clock_deref(sc->fclk); + at91_pmc_clock_deref(sc->iclk); + + if (sc->sc_ohci.ih) { + bus_teardown_intr(dev, sc->sc_ohci.irq_res, sc->sc_ohci.ih); + sc->sc_ohci.ih = NULL; } - if (sc->sc_bus.bdev) { - device_delete_child(dev, sc->sc_bus.bdev); - sc->sc_bus.bdev = NULL; + if (sc->sc_ohci.sc_bus.bdev) { + device_delete_child(dev, sc->sc_ohci.sc_bus.bdev); + sc->sc_ohci.sc_bus.bdev = NULL; } - if (sc->irq_res) { - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); - sc->irq_res = NULL; + if (sc->sc_ohci.irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_ohci.irq_res); + sc->sc_ohci.irq_res = NULL; } - if (sc->io_res) { - bus_release_resource(dev, SYS_RES_MEMORY, MEM_RID, sc->io_res); - sc->io_res = NULL; - sc->iot = 0; - sc->ioh = 0; + if (sc->sc_ohci.io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, MEM_RID, sc->sc_ohci.io_res); + sc->sc_ohci.io_res = NULL; + sc->sc_ohci.iot = 0; + sc->sc_ohci.ioh = 0; } return (0); } @@ -156,7 +190,7 @@ static driver_t ohci_driver = { "ohci", ohci_methods, - sizeof(ohci_softc_t), + sizeof(struct at91_ohci_softc), }; static devclass_t ohci_devclass; From owner-p4-projects@FreeBSD.ORG Fri Feb 24 01:30:54 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 E1D7616A423; Fri, 24 Feb 2006 01:30:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2C7B16A420 for ; Fri, 24 Feb 2006 01:30:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AA1743D48 for ; Fri, 24 Feb 2006 01:30:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O1UrIJ044041 for ; Fri, 24 Feb 2006 01:30:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O1UrjB044038 for perforce@freebsd.org; Fri, 24 Feb 2006 01:30:53 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Feb 2006 01:30:53 GMT Message-Id: <200602240130.k1O1UrjB044038@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 92310 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, 24 Feb 2006 01:30:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92310 Change 92310 by imp@imp_Speedy on 2006/02/24 01:30:14 Remove hack Affected files ... .. //depot/projects/arm/src/sys/dev/usb/ohci.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/dev/usb/ohci.c#8 (text+ko) ==== @@ -724,7 +724,7 @@ printf(" OHCI version %d.%d%s\n", OHCI_REV_HI(rev), OHCI_REV_LO(rev), OHCI_REV_LEGACY(rev) ? ", legacy support" : ""); - if (0 && OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) { + if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) { printf("%s: unsupported OHCI revision\n", USBDEVNAME(sc->sc_bus.bdev)); sc->sc_bus.usbrev = USBREV_UNKNOWN; From owner-p4-projects@FreeBSD.ORG Fri Feb 24 01:53: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 4411716A423; Fri, 24 Feb 2006 01:53:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F236A16A420 for ; Fri, 24 Feb 2006 01:53:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F35A43D58 for ; Fri, 24 Feb 2006 01:53:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O1rLts044884 for ; Fri, 24 Feb 2006 01:53:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O1rLVp044881 for perforce@freebsd.org; Fri, 24 Feb 2006 01:53:21 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Feb 2006 01:53:21 GMT Message-Id: <200602240153.k1O1rLVp044881@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 92312 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, 24 Feb 2006 01:53:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92312 Change 92312 by imp@imp_Speedy on 2006/02/24 01:52:54 debug... # I had it working, removed debug committed, and now it doesn't # work :-( Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#11 (text+ko) ==== @@ -69,7 +69,7 @@ static struct at91_pmc_clock main_ck = { .name = "main", // Main clock - .refcnt = 1, + .refcnt = 0, .id = 1, .primary = 1, .pmc_mask = PMC_IER_MOSCS, @@ -113,7 +113,7 @@ static struct at91_pmc_clock mck = { .name = "mck", .pmc_mask = PMC_IER_MCKRDY, - .refcnt = 1, + .refcnt = 0, }; static struct at91_pmc_clock udc_clk = { @@ -160,6 +160,7 @@ struct at91_pmc_softc *sc = pmc_softc; uint32_t value; + printf("Turning PLLB %#x %s\n", sc->pllb_init, on ? "on" : "off"); if (on) { on = PMC_IER_LOCKB; value = sc->pllb_init; @@ -169,6 +170,7 @@ WR4(sc, CKGR_PLLBR, value); while ((RD4(sc, PMC_SR) & PMC_IER_LOCKB) != on) continue; + printf("Done!\n"); } static void @@ -176,7 +178,15 @@ { struct at91_pmc_softc *sc = pmc_softc; + printf("Turning SC %#x %s\n", clk->pmc_mask, on ? "on" : "off"); WR4(sc, on ? PMC_SCER : PMC_SCDR, clk->pmc_mask); + if (on) + while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) != clk->pmc_mask) + continue; + else + while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) == clk->pmc_mask) + continue; + printf("Done!\n"); } static void @@ -184,7 +194,15 @@ { struct at91_pmc_softc *sc = pmc_softc; + printf("Turning PC %#x %s\n", clk->pmc_mask, on ? "on" : "off"); WR4(sc, on ? PMC_PCER : PMC_PCDR, clk->pmc_mask); + if (on) + while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) != clk->pmc_mask) + continue; + else + while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) == clk->pmc_mask) + continue; + printf("Done!\n"); } struct at91_pmc_clock * @@ -192,7 +210,6 @@ { int i; - /* XXX LOCKING? XXX */ for (i = 0; i < sizeof(clock_list) / sizeof(clock_list[0]); i++) if (strcmp(name, clock_list[i]->name) == 0) return (clock_list[i]); @@ -208,6 +225,8 @@ void at91_pmc_clock_enable(struct at91_pmc_clock *clk) { + /* XXX LOCKING? XXX */ + printf("Enable %s\n", clk->name); if (clk->parent) at91_pmc_clock_enable(clk->parent); if (clk->refcnt++ == 0 && clk->set_mode) @@ -217,6 +236,7 @@ void at91_pmc_clock_disable(struct at91_pmc_clock *clk) { + /* XXX LOCKING? XXX */ if (--clk->refcnt == 0 && clk->set_mode) clk->set_mode(clk, 0); if (clk->parent) ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#10 (text+ko) ==== @@ -110,6 +110,7 @@ /* * turn on the clocks from the AT91's point of view. Keep the unit in reset. */ +// bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0); at91_pmc_clock_enable(sc->iclk); at91_pmc_clock_enable(sc->fclk); bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0); From owner-p4-projects@FreeBSD.ORG Fri Feb 24 01:55: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 C9C2B16A423; Fri, 24 Feb 2006 01:55:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85D9B16A420 for ; Fri, 24 Feb 2006 01:55:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35B9543D48 for ; Fri, 24 Feb 2006 01:55:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O1tPM7044983 for ; Fri, 24 Feb 2006 01:55:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O1tOGD044980 for perforce@freebsd.org; Fri, 24 Feb 2006 01:55:24 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 01:55:24 GMT Message-Id: <200602240155.k1O1tOGD044980@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 92313 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, 24 Feb 2006 01:55:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92313 Change 92313 by marcel@marcel_nfs on 2006/02/24 01:54:27 IFC @92311 Affected files ... .. //depot/projects/uart/conf/kmod.mk#19 integrate .. //depot/projects/uart/dev/amr/amr_linux.c#2 integrate .. //depot/projects/uart/dev/ata/ata-all.h#11 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#13 integrate .. //depot/projects/uart/dev/fdc/fdc.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#8 integrate .. //depot/projects/uart/kern/kern_timeout.c#8 integrate .. //depot/projects/uart/modules/uart/Makefile#13 integrate .. //depot/projects/uart/netinet/tcp_input.c#16 integrate .. //depot/projects/uart/netinet/tcp_output.c#9 integrate Differences ... ==== //depot/projects/uart/conf/kmod.mk#19 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.205 2006/02/20 01:08:33 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.206 2006/02/24 01:49:36 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -318,11 +318,11 @@ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ - dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/scc/scc_if.m \ - dev/smbus/smbus_if.m dev/sound/pcm/ac97_if.m \ - dev/sound/pcm/channel_if.m dev/sound/pcm/feeder_if.m \ - dev/sound/pcm/mixer_if.m dev/uart/uart_if.m dev/usb/usb_if.m \ - isa/isa_if.m kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ + dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ + dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ + dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ + dev/usb/usb_if.m isa/isa_if.m \ + kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m ==== //depot/projects/uart/dev/amr/amr_linux.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.1 2006/01/24 21:13:49 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.2 2006/02/23 18:05:38 jhb Exp $"); #include #include @@ -170,13 +170,15 @@ devclass_t devclass; struct amr_softc *sc; struct amr_linux_ioctl ali; - int adapter; + int adapter, error; devclass = devclass_find("amr"); if (devclass == NULL) return (ENOENT); - copyin((caddr_t)args->arg, &ali, sizeof(ali)); + error = copyin((caddr_t)args->arg, &ali, sizeof(ali)); + if (error) + return (error); if (ali.ui.fcs.opcode == 0x82) adapter = 0; else ==== //depot/projects/uart/dev/ata/ata-all.h#11 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-all.h,v 1.113 2006/02/09 20:54:42 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.114 2006/02/23 20:15:22 sos Exp $ */ /* ATA register defines */ @@ -338,6 +338,7 @@ /* structure used to queue an ATA/ATAPI request */ struct ata_request { device_t dev; /* device handle */ + device_t parent; /* channel handle */ union { struct { u_int8_t command; /* command reg */ ==== //depot/projects/uart/dev/ata/ata-chipset.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.159 2006/02/16 17:09:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.160 2006/02/23 18:52:15 sos Exp $"); #include "opt_ata.h" #include @@ -4075,7 +4075,6 @@ /* setup the usual register normal pci style */ if (ata_pci_allocate(dev)) return ENXIO; - ata_pci_allocate(dev); if (ctlr->chip->cfg2 & SIIINTR) ch->hw.status = ata_cmd_status; ==== //depot/projects/uart/dev/ata/ata-queue.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.55 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.56 2006/02/23 20:15:22 sos Exp $"); #include "opt_ata.h" #include @@ -55,6 +55,7 @@ /* mark request as virgin (this might be a ATA_R_REQUEUE) */ request->result = request->status = request->error = 0; + request->parent = device_get_parent(request->dev); callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED); if (!request->callback && !(request->flags & ATA_R_REQUEUE)) @@ -218,7 +219,7 @@ void ata_finish(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); /* * if in ATA_STALL_QUEUE state or request has ATA_R_DIRECT flags set @@ -247,7 +248,7 @@ ata_completed(void *context, int dummy) { struct ata_request *request = (struct ata_request *)context; - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); struct ata_device *atadev = device_get_softc(request->dev); struct ata_composite *composite; @@ -466,7 +467,7 @@ void ata_timeout(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); //request->flags |= ATA_R_DEBUG; ATA_DEBUG_RQ(request, "timeout"); @@ -479,7 +480,6 @@ */ if (ch->state == ATA_ACTIVE) { request->flags |= ATA_R_TIMEOUT; - ch->running = NULL; mtx_unlock(&ch->state_mtx); ATA_LOCKING(ch->dev, ATA_LF_UNLOCK); ata_finish(request); @@ -493,34 +493,43 @@ ata_fail_requests(device_t dev) { struct ata_channel *ch = device_get_softc(device_get_parent(dev)); - struct ata_request *request; + struct ata_request *request, *tmp; + TAILQ_HEAD(, ata_request) fail_requests; + TAILQ_INIT(&fail_requests); - /* do we have any outstanding request to care about ?*/ + /* grap all channel locks to avoid races */ + mtx_lock(&ch->queue_mtx); mtx_lock(&ch->state_mtx); + + /* do we have any running request to care about ? */ if ((request = ch->running) && (!dev || request->dev == dev)) { callout_stop(&request->callout); ch->running = NULL; - } - else - request = NULL; - mtx_unlock(&ch->state_mtx); - if (request) { + ch->state = ATA_IDLE; request->result = ENXIO; - ata_finish(request); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } /* fail all requests queued on this channel for device dev if !NULL */ - mtx_lock(&ch->queue_mtx); - while ((request = TAILQ_FIRST(&ch->ata_queue))) { + TAILQ_FOREACH_SAFE(request, &ch->ata_queue, chain, tmp) { if (!dev || request->dev == dev) { TAILQ_REMOVE(&ch->ata_queue, request, chain); - mtx_unlock(&ch->queue_mtx); request->result = ENXIO; - ata_finish(request); - mtx_lock(&ch->queue_mtx); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } } + + mtx_unlock(&ch->state_mtx); mtx_unlock(&ch->queue_mtx); + + /* finish up all requests collected above */ + TAILQ_FOREACH_SAFE(request, &fail_requests, chain, tmp) { + TAILQ_REMOVE(&fail_requests, request, chain); + ata_finish(request); + } + + /* we might have work for the other device on this channel */ + ata_start(ch->dev); } static u_int64_t ==== //depot/projects/uart/dev/fdc/fdc.c#10 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.308 2005/08/30 23:12:18 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.309 2006/02/23 19:11:16 jhb Exp $"); #include "opt_fdc.h" @@ -250,7 +250,6 @@ #define FD_NO_TRACK -2 int options; /* FDOPT_* */ struct callout toffhandle; - struct callout tohandle; struct g_geom *fd_geom; struct g_provider *fd_provider; device_t dev; @@ -617,7 +616,7 @@ int once; fd = arg; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd->flags &= ~FD_MOTORWAIT; fd->flags |= FD_MOTOR; once = 0; @@ -628,7 +627,6 @@ bioq_disksort(&fd->fdc->head, bp); once = 1; } - mtx_unlock(&fd->fdc->fdc_mtx); if (once) wakeup(&fd->fdc->head); } @@ -647,7 +645,7 @@ fdc->fdout |= (FDO_MOEN0 << fd->fdsu); callout_reset(&fd->toffhandle, hz, fd_turnon, fd); } else { - callout_drain(&fd->toffhandle); + callout_stop(&fd->toffhandle); fd->flags &= ~(FD_MOTOR|FD_MOTORWAIT); fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu); } @@ -659,9 +657,8 @@ { struct fd_data *fd = xfd; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd_motor(fd, 0); - mtx_unlock(&fd->fdc->fdc_mtx); } /* @@ -1199,7 +1196,7 @@ mtx_lock(&fdc->fdc_mtx); /* If we go from idle, cancel motor turnoff */ if (fd->fd_iocount++ == 0) - callout_drain(&fd->toffhandle); + callout_stop(&fd->toffhandle); if (fd->flags & FD_MOTOR) { /* The motor is on, send it directly to the controller */ bioq_disksort(&fdc->head, bp); @@ -1939,8 +1936,7 @@ fd->fdc = fdc; fd->fdsu = fdsu; fd->options = 0; - callout_init(&fd->toffhandle, 1); - callout_init(&fd->tohandle, 1); + callout_init_mtx(&fd->toffhandle, &fd->fdc->fdc_mtx, 0); /* initialize densities for subdevices */ fdsettype(fd, fd_native_types[fd->type]); ==== //depot/projects/uart/dev/sound/pcm/feeder.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.36 2006/01/29 01:32:37 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.37 2006/02/23 19:23:55 jhb Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -385,10 +385,8 @@ } } else if (best2 == 0) return best1; - else if (best1 == 0) + else return best2; - - return best1; } u_int32_t ==== //depot/projects/uart/kern/kern_timeout.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.100 2005/09/15 20:20:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.101 2006/02/23 19:13:12 jhb Exp $"); #include #include @@ -78,37 +78,22 @@ /** * Locked by callout_lock: * curr_callout - If a callout is in progress, it is curr_callout. - * If curr_callout is non-NULL, threads waiting on - * callout_wait will be woken up as soon as the + * If curr_callout is non-NULL, threads waiting in + * callout_drain() will be woken up as soon as the * relevant callout completes. * curr_cancelled - Changing to 1 with both callout_lock and c_mtx held * guarantees that the current callout will not run. * The softclock() function sets this to 0 before it * drops callout_lock to acquire c_mtx, and it calls - * the handler only if curr_cancelled still 0 when + * the handler only if curr_cancelled is still 0 after * c_mtx is successfully acquired. - * wakeup_ctr - Incremented every time a thread wants to wait - * for a callout to complete. Modified only when + * callout_wait - If a thread is waiting in callout_drain(), then + * callout_wait is nonzero. Set only when * curr_callout is non-NULL. - * wakeup_needed - If a thread is waiting on callout_wait, then - * wakeup_needed is nonzero. Increased only when - * cutt_callout is non-NULL. */ static struct callout *curr_callout; static int curr_cancelled; -static int wakeup_ctr; -static int wakeup_needed; - -/** - * Locked by callout_wait_lock: - * callout_wait - If wakeup_needed is set, callout_wait will be - * triggered after the current callout finishes. - * wakeup_done_ctr - Set to the current value of wakeup_ctr after - * callout_wait is triggered. - */ -static struct mtx callout_wait_lock; -static struct cv callout_wait; -static int wakeup_done_ctr; +static int callout_wait; /* * kern_timeout_callwheel_alloc() - kernel low level callwheel initialization @@ -157,8 +142,6 @@ TAILQ_INIT(&callwheel[i]); } mtx_init(&callout_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE); - mtx_init(&callout_wait_lock, "callout_wait_lock", NULL, MTX_DEF); - cv_init(&callout_wait, "callout_wait"); } /* @@ -188,7 +171,6 @@ int mpcalls; int mtxcalls; int gcalls; - int wakeup_cookie; #ifdef DIAGNOSTIC struct bintime bt1, bt2; struct timespec ts2; @@ -262,8 +244,7 @@ */ if (curr_cancelled) { mtx_unlock(c_mtx); - mtx_lock_spin(&callout_lock); - goto done_locked; + goto skip; } /* The callout cannot be stopped now. */ curr_cancelled = 1; @@ -308,22 +289,16 @@ #endif if ((c_flags & CALLOUT_RETURNUNLOCKED) == 0) mtx_unlock(c_mtx); + skip: mtx_lock_spin(&callout_lock); -done_locked: curr_callout = NULL; - if (wakeup_needed) { + if (callout_wait) { /* - * There might be someone waiting + * There is someone waiting * for the callout to complete. */ - wakeup_cookie = wakeup_ctr; - mtx_unlock_spin(&callout_lock); - mtx_lock(&callout_wait_lock); - cv_broadcast(&callout_wait); - wakeup_done_ctr = wakeup_cookie; - mtx_unlock(&callout_wait_lock); - mtx_lock_spin(&callout_lock); - wakeup_needed = 0; + wakeup(&callout_wait); + callout_wait = 0; } steps = 0; c = nextsoftcheck; @@ -445,7 +420,7 @@ */ if (c->c_mtx != NULL && !curr_cancelled) cancelled = curr_cancelled = 1; - if (wakeup_needed) { + if (callout_wait) { /* * Someone has called callout_drain to kill this * callout. Don't reschedule. @@ -497,7 +472,7 @@ struct callout *c; int safe; { - int use_mtx, wakeup_cookie; + int use_mtx; if (!safe && c->c_mtx != NULL) { #ifdef notyet /* Some callers do not hold Giant for Giant-locked callouts. */ @@ -512,37 +487,47 @@ mtx_lock_spin(&callout_lock); /* - * Don't attempt to delete a callout that's not on the queue. + * If the callout isn't pending, it's not on the queue, so + * don't attempt to remove it from the queue. We can try to + * stop it by other means however. */ if (!(c->c_flags & CALLOUT_PENDING)) { c->c_flags &= ~CALLOUT_ACTIVE; + + /* + * If it wasn't on the queue and it isn't the current + * callout, then we can't stop it, so just bail. + */ if (c != curr_callout) { mtx_unlock_spin(&callout_lock); return (0); } + if (safe) { - /* We need to wait until the callout is finished. */ - wakeup_needed = 1; - wakeup_cookie = wakeup_ctr++; - mtx_unlock_spin(&callout_lock); - mtx_lock(&callout_wait_lock); - /* - * Check to make sure that softclock() didn't - * do the wakeup in between our dropping - * callout_lock and picking up callout_wait_lock + * The current callout is running (or just + * about to run) and blocking is allowed, so + * just wait for the current invocation to + * finish. */ - if (wakeup_cookie - wakeup_done_ctr > 0) - cv_wait(&callout_wait, &callout_wait_lock); - - mtx_unlock(&callout_wait_lock); + while (c == curr_callout) { + callout_wait = 1; + msleep_spin(&callout_wait, &callout_lock, + "codrain", 0); + } } else if (use_mtx && !curr_cancelled) { - /* We can stop the callout before it runs. */ + /* + * The current callout is waiting for it's + * mutex which we hold. Cancel the callout + * and return. After our caller drops the + * mutex, the callout will be skipped in + * softclock(). + */ curr_cancelled = 1; mtx_unlock_spin(&callout_lock); return (1); - } else - mtx_unlock_spin(&callout_lock); + } + mtx_unlock_spin(&callout_lock); return (0); } c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING); ==== //depot/projects/uart/modules/uart/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/uart/Makefile,v 1.13 2004/11/20 23:38:48 marcel Exp $ +# $FreeBSD: src/sys/modules/uart/Makefile,v 1.14 2006/02/24 01:49:36 marcel Exp $ .PATH: ${.CURDIR}/../../dev/uart @@ -15,4 +15,8 @@ SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \ power_if.h uart_if.h pccarddevs.h +MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ + dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \ + kern/device_if.m + .include ==== //depot/projects/uart/netinet/tcp_input.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.289 2006/02/18 17:05:00 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.290 2006/02/23 21:14:34 qingli Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1421,7 +1421,7 @@ * SYN-SENT* -> SYN-RECEIVED* * If there was no CC option, clear cached CC value. */ - tp->t_flags |= TF_ACKNOW; + tp->t_flags |= (TF_ACKNOW | TF_NEEDSYN); callout_stop(tp->tt_rexmt); tp->t_state = TCPS_SYN_RECEIVED; } ==== //depot/projects/uart/netinet/tcp_output.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.114 2005/11/18 20:12:39 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.115 2006/02/23 21:14:34 qingli Exp $ */ #include "opt_inet.h" @@ -338,7 +338,8 @@ * know that foreign host supports TAO, suppress sending segment. */ if ((flags & TH_SYN) && SEQ_GT(tp->snd_nxt, tp->snd_una)) { - flags &= ~TH_SYN; + if (tp->t_state != TCPS_SYN_RECEIVED) + flags &= ~TH_SYN; off--, len++; } From owner-p4-projects@FreeBSD.ORG Fri Feb 24 02:28: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 99CF316A424; Fri, 24 Feb 2006 02:28:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B73C16A422 for ; Fri, 24 Feb 2006 02:28:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF00143D70 for ; Fri, 24 Feb 2006 02:28:08 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O2S8Bt046503 for ; Fri, 24 Feb 2006 02:28:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O2S8PY046500 for perforce@freebsd.org; Fri, 24 Feb 2006 02:28:08 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 02:28:08 GMT Message-Id: <200602240228.k1O2S8PY046500@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 92318 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, 24 Feb 2006 02:28:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92318 Change 92318 by marcel@marcel_nfs on 2006/02/24 02:27:56 IFC @92317 Affected files ... .. //depot/projects/uart/dev/ic/z8530.h#5 integrate .. //depot/projects/uart/dev/puc/puc_ebus.c#11 integrate .. //depot/projects/uart/dev/puc/puc_sbus.c#12 integrate .. //depot/projects/uart/sys/serial.h#4 integrate Differences ... ==== //depot/projects/uart/dev/ic/z8530.h#5 (text+ko) ==== @@ -23,7 +23,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/dev/ic/z8530.h,v 1.3 2005/01/06 01:42:44 imp Exp $ + * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.4 2006/02/24 02:03:35 marcel Exp $ */ #ifndef _DEV_IC_Z8530_H_ ==== //depot/projects/uart/dev/puc/puc_ebus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.6 2005/08/07 13:37:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.7 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" ==== //depot/projects/uart/dev/puc/puc_sbus.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.8 2005/02/26 00:25:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.9 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" ==== //depot/projects/uart/sys/serial.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * (both async and sync), but which do not necessarily have anything to * do with tty processing. * - * $FreeBSD: src/sys/sys/serial.h,v 1.2 2004/06/25 10:56:43 phk Exp $ + * $FreeBSD: src/sys/sys/serial.h,v 1.4 2006/02/24 02:24:10 marcel Exp $ */ #ifndef _SYS_SERIAL_H_ @@ -52,7 +52,7 @@ #define SER_MASK_STATE 0x00ff /* Delta bits, used to indicate which signals should/was affected */ -#define SER_DELTA(x) ((x) << 8) +#define SER_DELTA(x) ((x) << 8) #define SER_DDTR SER_DELTA(SER_DTR) #define SER_DRTS SER_DELTA(SER_RTS) From owner-p4-projects@FreeBSD.ORG Fri Feb 24 02:47: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 E64F816A423; Fri, 24 Feb 2006 02:47:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4FB616A420 for ; Fri, 24 Feb 2006 02:47:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A85143D48 for ; Fri, 24 Feb 2006 02:47:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O2lX6n047347 for ; Fri, 24 Feb 2006 02:47:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O2lWMj047344 for perforce@freebsd.org; Fri, 24 Feb 2006 02:47:32 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 02:47:32 GMT Message-Id: <200602240247.k1O2lWMj047344@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 92320 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, 24 Feb 2006 02:47:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=92320 Change 92320 by marcel@marcel_nfs on 2006/02/24 02:46:34 IFC @92319 Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#37 integrate .. //depot/projects/uart/dev/uart/uart_core.c#43 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#35 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#37 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#25 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#24 integrate Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#37 (text+ko) ==== @@ -23,7 +23,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/dev/uart/uart_bus.h,v 1.9 2005/01/06 01:43:26 imp Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.10 2006/02/24 02:42:26 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ ==== //depot/projects/uart/dev/uart/uart_core.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.15 2006/02/22 18:16:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.16 2006/02/24 02:42:26 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.14 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.15 2006/02/24 02:42:26 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.10 2005/01/30 22:14:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.11 2006/02/24 02:42:26 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.12 2005/04/27 21:57:51 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.13 2006/02/24 02:42:26 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_kbd_sun.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.6 2005/10/25 19:48:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.7 2006/02/24 02:42:26 marcel Exp $"); #include "opt_kbd.h" ==== //depot/projects/uart/dev/uart/uart_tty.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.25 2005/10/26 15:52:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.26 2006/02/24 02:42:26 marcel Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Fri Feb 24 05:47: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 6A82D16A423; Fri, 24 Feb 2006 05:47:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41A0216A420 for ; Fri, 24 Feb 2006 05:47:10 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE83B43D46 for ; Fri, 24 Feb 2006 05:47:09 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O5l9Kl063299 for ; Fri, 24 Feb 2006 05:47:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O5l9G5063296 for perforce@freebsd.org; Fri, 24 Feb 2006 05:47:09 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 05:47:09 GMT Message-Id: <200602240547.k1O5l9G5063296@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 92323 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, 24 Feb 2006 05:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92323 Change 92323 by marcel@marcel_nfs on 2006/02/24 05:46:45 IFC @92322 Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#38 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#13 integrate .. //depot/projects/uart/dev/uart/uart_core.c#44 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#36 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#38 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#26 integrate Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#38 (text+ko) ==== @@ -23,7 +23,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/dev/uart/uart_bus.h,v 1.10 2006/02/24 02:42:26 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.11 2006/02/24 05:40:17 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ @@ -48,11 +48,6 @@ #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 -#define UART_SIGMASK_DTE (SER_DTR | SER_RTS) -#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI) -#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE) -#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8) - #ifdef UART_PPS_ON_CTS #define UART_SIG_DPPS SER_DCTS #define UART_SIG_PPS SER_CTS ==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.9 2006/02/04 23:27:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.10 2006/02/24 05:36:44 marcel Exp $"); #include #include @@ -66,6 +66,7 @@ const char *nm, *cmpt; struct uart_softc *sc; struct uart_devinfo dummy; + int error; sc = device_get_softc(dev); sc->sc_class = NULL; @@ -101,7 +102,8 @@ } if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { sc->sc_class = &uart_sab82532_class; - return (uart_bus_probe(dev, 0, 0, 0, 1)); + error = uart_bus_probe(dev, 0, 0, 0, 1); + return ((error <= 0) ? BUS_PROBE_GENERIC : error); } return (ENXIO); ==== //depot/projects/uart/dev/uart/uart_core.c#44 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.16 2006/02/24 02:42:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.17 2006/02/24 05:40:17 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -182,7 +182,7 @@ */ do { old = sc->sc_ttypend; - new = old & ~UART_SIGMASK_STATE; + new = old & ~SER_MASK_STATE; new |= sig & SER_INT_SIGMASK; new |= SER_INT_SIGCHG; } while (!atomic_cmpset_32(&sc->sc_ttypend, old, new)); ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#36 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.15 2006/02/24 02:42:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.16 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -460,7 +460,7 @@ SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#38 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.11 2006/02/24 02:42:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.12 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -470,7 +470,7 @@ } SIGCHG(pvr, sig, SER_DSR, SER_DDSR); mtx_unlock_spin(&sc->sc_hwmtx); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.13 2006/02/24 02:42:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.14 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -354,7 +354,7 @@ SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -439,7 +439,7 @@ SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR); - if (sig & UART_SIGMASK_DELTA) + if (sig & SER_MASK_DELTA) ipend |= SER_INT_SIGCHG; src = uart_getmreg(bas, RR_SRC); if (src & SRC_OVR) { From owner-p4-projects@FreeBSD.ORG Fri Feb 24 06:53: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 73D4416A423; Fri, 24 Feb 2006 06:53:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B55D16A420 for ; Fri, 24 Feb 2006 06:53:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A19943D45 for ; Fri, 24 Feb 2006 06:53:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O6rTBj065450 for ; Fri, 24 Feb 2006 06:53:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O6rTDk065447 for perforce@freebsd.org; Fri, 24 Feb 2006 06:53:29 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Feb 2006 06:53:29 GMT Message-Id: <200602240653.k1O6rTDk065447@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 92324 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, 24 Feb 2006 06:53:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=92324 Change 92324 by imp@imp_hammer on 2006/02/24 06:53:12 Hmm, I removed this at the same time I removed the debugging, so add it back. I may need to do more to get things working, but I didn't want to forget this by morning. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#12 (text+ko) ==== @@ -343,6 +343,8 @@ freq / 1000000, mck.hz / 1000000); WR4(sc, PMC_SCDR, PMC_SCER_PCK0 | PMC_SCER_PCK1 | PMC_SCER_PCK2 | PMC_SCER_PCK3); + /* XXX kludge, turn on all peripherals */ + WR4(sc, PMC_PCER, 0xffffffff); /* Disable all interrupts for PMC */ WR4(sc, PMC_IDR, 0xffffffff); } From owner-p4-projects@FreeBSD.ORG Fri Feb 24 15:09:07 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 9D17E16A425; Fri, 24 Feb 2006 15:09:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7372D16A422 for ; Fri, 24 Feb 2006 15:09:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21C1843D49 for ; Fri, 24 Feb 2006 15:09:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OF95Ye098371 for ; Fri, 24 Feb 2006 15:09:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OF957n098368 for perforce@freebsd.org; Fri, 24 Feb 2006 15:09:05 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Feb 2006 15:09:05 GMT Message-Id: <200602241509.k1OF957n098368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92336 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, 24 Feb 2006 15:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92336 Change 92336 by jhb@jhb_zion on 2006/02/24 15:08:55 - Make the spin lock too long panic message more useful and more accurate (the "5 seconds" is dubious). - Allow idle threads to spin on sched_lock forever. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#118 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#118 (text+ko) ==== @@ -91,8 +91,9 @@ */ #define mtx_unowned(m) ((m)->mtx_lock == MTX_UNOWNED) -#define mtx_owner(m) (mtx_unowned((m)) ? NULL \ - : (struct thread *)((m)->mtx_lock & MTX_FLAGMASK)) +#define mtx_rawowner(m) ((struct thread *)((m)->mtx_lock & MTX_FLAGMASK)) + +#define mtx_owner(m) (mtx_unowned((m)) ? NULL : mtx_rawowner((m))) #ifdef DDB static void db_show_mtx(struct lock_object *lock); @@ -550,7 +551,8 @@ if (m != &Giant && TD_IS_RUNNING(owner)) { #endif turnstile_release(&m->mtx_object); - while (mtx_owner(m) == owner && TD_IS_RUNNING(owner)) { + while (mtx_rawowner(m) == owner && + TD_IS_RUNNING(owner)) { cpu_spinwait(); } continue; @@ -606,7 +608,8 @@ _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { - int i = 0; + int i = 0, idlespin = 0; + struct thread *td; #ifdef __i386__ int apic_hack; #endif @@ -614,6 +617,9 @@ if (LOCK_LOG_TEST(&m->mtx_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); + /* It's ok for the idle loop to spin forever on sched_lock. */ + if (m == &sched_lock && curthread == PCPU_GET(idlethread)) + idlespin = 1; for (;;) { if (_obtain_lock(m, tid)) break; @@ -630,14 +636,17 @@ cpu_spinwait(); continue; } - if (i < 60000000) + if (i < 60000000 || kdb_active || panicstr != NULL || + idlespin) DELAY(1); - else if (!kdb_active && !panicstr) { - printf("spin lock %s held by %p for > 5 seconds\n", - m->mtx_object.lo_name, (void *)m->mtx_lock); + else { + td = mtx_owner(m); + printf( + "spin lock %p (%s) held by %p (tid %d) too long\n", + m, m->mtx_object.lo_name, mtx_rawowner(m), + td ? td->td_tid : -1); #ifdef WITNESS - witness_display_spinlock(&m->mtx_object, - mtx_owner(m)); + witness_display_spinlock(&m->mtx_object, td); #endif panic("spin lock held too long"); } From owner-p4-projects@FreeBSD.ORG Fri Feb 24 17:37: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 AB35316A42C; Fri, 24 Feb 2006 17:37:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5808116A422 for ; Fri, 24 Feb 2006 17:37:42 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC3843D94 for ; Fri, 24 Feb 2006 17:36:21 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OHaJul012130 for ; Fri, 24 Feb 2006 17:36:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OHaJXo012127 for perforce@freebsd.org; Fri, 24 Feb 2006 17:36:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Feb 2006 17:36:19 GMT Message-Id: <200602241736.k1OHaJXo012127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92345 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, 24 Feb 2006 17:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92345 Change 92345 by kmacy@kmacy_storage:sun4v_work on 2006/02/24 17:35:56 OF_translate_virt never worked - remove it and other code in openfirm_mmu.c Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#6 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm_mmu.c#2 delete Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#6 (text+ko) ==== @@ -25,7 +25,6 @@ dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard -dev/ofw/openfirm_mmu.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard dev/uart/uart_cpu_sparc64.c optional uart ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.c#3 (text+ko) ==== @@ -858,8 +858,8 @@ 0, }; - args.tba_addr = (cell_t)tba_addr; - args.mmfsa_ra = (cell_t)mmfsa_ra; + args.tba_addr = p1275_ptr2cell(tba_addr); + args.mmfsa_ra = p1275_ptr2cell(mmfsa_ra); openfirmware(&args); } ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#3 (text+ko) ==== @@ -76,6 +76,29 @@ MALLOC_DECLARE(M_OFWPROP); +#define p1275_ptr2cell(p) ((cell_t)((uintptr_t)((void *)(p)))) +#define p1275_int2cell(i) ((cell_t)((int)(i))) +#define p1275_uint2cell(u) ((cell_t)((unsigned int)(u))) +#define p1275_size2cell(u) ((cell_t)((size_t)(u))) +#define p1275_phandle2cell(ph) ((cell_t)((unsigned int)((phandle_t)(ph)))) +#define p1275_dnode2cell(d) ((cell_t)((unsigned int)((pnode_t)(d)))) +#define p1275_ihandle2cell(ih) ((cell_t)((unsigned int)((ihandle_t)(ih)))) +#define p1275_ull2cell_high(ll) (0LL) +#define p1275_ull2cell_low(ll) ((cell_t)(ll)) +#define p1275_uintptr2cell(i) ((cell_t)((uintptr_t)(i))) + +#define p1275_cell2ptr(p) ((void *)((cell_t)(p))) +#define p1275_cell2int(i) ((int)((cell_t)(i))) +#define p1275_cell2uint(u) ((unsigned int)((cell_t)(u))) +#define p1275_cell2size(u) ((size_t)((cell_t)(u))) +#define p1275_cell2phandle(ph) ((phandle_t)((cell_t)(ph))) +#define p1275_cell2dnode(d) ((pnode_t)((cell_t)(d))) +#define p1275_cell2ihandle(ih) ((ihandle_t)((cell_t)(ih))) +#define p1275_cells2ull(h, l) ((unsigned long long)(cell_t)(l)) +#define p1275_cell2uintptr(i) ((uintptr_t)((cell_t)(i))) + + + /* * Stuff that is used by the Open Firmware code. */ From owner-p4-projects@FreeBSD.ORG Fri Feb 24 17:51: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 CDF6B16A424; Fri, 24 Feb 2006 17:51:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9279C16A420 for ; Fri, 24 Feb 2006 17:51:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 461A843D45 for ; Fri, 24 Feb 2006 17:51:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OHpeVR012794 for ; Fri, 24 Feb 2006 17:51:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OHpdlG012788 for perforce@freebsd.org; Fri, 24 Feb 2006 17:51:39 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Feb 2006 17:51:39 GMT Message-Id: <200602241751.k1OHpdlG012788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92348 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, 24 Feb 2006 17:51:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92348 Change 92348 by kmacy@kmacy_storage:sun4v_work on 2006/02/24 17:50:39 add a couple of block initializing store ASIs add accessor macros for scratch registers use ASI immediates on store alternate instructions add tl0_end[] to enable CTASSERT on size of trap table comment fields in pcb remove page directory reference remove pcb reference from pcpu.h Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#8 (text+ko) ==== @@ -56,7 +56,9 @@ #define ASI_LDTD_AIUS 0x23 /* ASI_LOAD_TWIN_DW_AS_IF_USER_SECONDARY */ #define ASI_QUEUE 0x25 #define ASI_LDTD_REAL 0x26 /* ASI_LOAD_TWIN_DW_REAL */ +#define ASI_STBI_REAL 0x26 #define ASI_LDTD_N 0x27 /* ASI_LOAD_TWIN_DW_NUCLEUS */ +#define ASI_STBI_N 0x27 #define ASI_LDTD_AIUPL 0x2A /* ASI_LD_TWIN_DW_AS_IF_USER_PRIMARY_LITTLE */ #define ASI_LDTD_AIUSL 0x2B /* ASI_LD_TWIN_DW_AS_IF_USER_SECONDARY_LITTLE */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#2 (text+ko) ==== @@ -32,17 +32,10 @@ #ifdef _KERNEL /* - * Normal and alternate %g6 point to the pcb of the current process. Normal, - & alternate and interrupt %g7 point to per-cpu data. + * %g7 points to per-cpu data. */ -#define PCB_REG %g6 #define PCPU_REG %g7 -/* - * Alternate %g5 points to a per-cpu panic stack, which is used as a last - * resort, and for temporarily saving alternate globals. - */ -#define ASP_REG %g5 #ifdef LOCORE @@ -134,6 +127,29 @@ #define EMPTY +#define GET_MMFSA_SCRATCH(reg) \ + ldxa [%g0 + %g0]ASI_SCRATCHPAD, reg; + +#define GET_PCPU_SCRATCH \ + mov SCRATCH_REG_PCPU, PCPU_REG; \ + ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; + +#define GET_PTD_SCRATCH(reg) \ + mov SCRATCH_REG_PTD, reg; \ + ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; + +#define SET_MMFSA_SCRATCH(reg) stxa reg, [%g0]ASI_SCRATCHPAD +#define SET_PCPU_SCRATCH stxa PCPU_REG, [%g0 + SCRATCH_REG_PCPU]ASI_SCRATCHPAD +#define SET_PTD_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_PTD]ASI_SCRATCHPAD + +#define GET_PCB(reg) \ + GET_PCPU_SCRATCH; \ + ldx [PCPU_REG + PC_CURPCB], reg; + +#define SAVE_V8_WINDOW(reg) + + + #endif /* LOCORE */ #endif /* _KERNEL */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#5 (text+ko) ==== @@ -116,6 +116,15 @@ #define lduwa(va, asi) LD_GENERIC(va, asi, lduwa, u_int) #define ldxa(va, asi) LD_GENERIC(va, asi, ldxa, u_long) +#if 1 +#define STNC_GEN(tp, o) \ + static __inline void \ + o ## _nc(caddr_t va, int asi, tp val) \ + { \ + __asm __volatile(#o " %0, [%g0 + %1] %2"\ + : : "r" (val), "r" (va), "r" (asi)); \ + } +#else #define STNC_GEN(tp, o) \ static __inline void \ o ## _nc(caddr_t va, int asi, tp val) \ @@ -123,6 +132,7 @@ __asm __volatile("wr %2, 0, %%asi;" #o " %0, [%1] %%asi"\ : : "r" (val), "r" (va), "r" (asi)); \ } +#endif STNC_GEN(u_char, stba); STNC_GEN(u_short, stha); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ typedef void cpu_block_copy_t(const void *src, void *dst, size_t len); typedef void cpu_block_zero_t(void *dst, size_t len); -extern char tl0_base[]; +extern char tl0_base[], tl0_end[]; extern char _end[]; extern long Maxmem; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#3 (text+ko) ==== @@ -37,16 +37,16 @@ /* NOTE: pcb_ufp must be aligned on a 64 byte boundary. */ struct pcb { - struct rwindow pcb_rw[MAXWIN]; - uint32_t pcb_kfp[64]; - uint32_t pcb_ufp[64]; - uint64_t pcb_rwsp[MAXWIN]; + struct rwindow pcb_rw[MAXWIN]; /* wbuf for page faults during spill / fill trap handling */ + uint32_t pcb_kfp[64]; /* used for regs in handling kernel floating point exc */ + uint32_t pcb_ufp[64]; /* used for regs in handling user floating point exc */ + uint64_t pcb_rwsp[MAXWIN]; /* spbuf sp's for each wbuf */ uint64_t pcb_flags; - uint64_t pcb_nsaved; - uint64_t pcb_pc; + uint32_t pcb_nsaved; /* number of windows saved in pcb_rw */ + uint32_t pcb_pc; uint64_t pcb_sp; - vm_paddr_t *pcb_pdir; - uint64_t pcb_pad[3]; + uint64_t pcb_pa; /* physical address of pcb */ + uint64_t pcb_pad[4]; } __aligned(64); #ifdef _KERNEL ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#4 (text+ko) ==== @@ -82,10 +82,8 @@ * be L2 cache aligned - they're surrounded by per-cpu data, so there is * no possibility of false sharing, but this might help in reducing misses */ -struct pcb; struct pcpu; -register struct pcb *curpcb __asm__(__XSTRING(PCB_REG)); register struct pcpu *pcpup __asm__(__XSTRING(PCPU_REG)); #define PCPU_GET(member) (pcpup->pc_ ## member) From owner-p4-projects@FreeBSD.ORG Fri Feb 24 17:51:44 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 10D2216A434; Fri, 24 Feb 2006 17:51:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFA0E16A422 for ; Fri, 24 Feb 2006 17:51:40 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93CEA43D48 for ; Fri, 24 Feb 2006 17:51:40 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OHpeh3012800 for ; Fri, 24 Feb 2006 17:51:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OHpeoO012797 for perforce@freebsd.org; Fri, 24 Feb 2006 17:51:40 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 17:51:40 GMT Message-Id: <200602241751.k1OHpeoO012797@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 92349 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, 24 Feb 2006 17:51:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92349 Change 92349 by marcel@marcel_nfs on 2006/02/24 17:51:01 Merge from uart(4): Recognize the SAB82532 in USIII machines. Affected files ... .. //depot/projects/uart/dev/scc/scc_bfe_ebus.c#3 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bfe_ebus.c#3 (text+ko) ==== @@ -46,11 +46,14 @@ scc_ebus_probe(device_t dev) { struct scc_softc *sc; - const char *nm; + const char *cmpt, *nm; sc = device_get_softc(dev); nm = ofw_bus_get_name(dev); - if (!strcmp(nm, "se")) { + cmpt = ofw_bus_get_compat(dev); + if (cmpt == NULL) + cmpt = ""; + if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); sc->sc_class = &scc_sab82532_class; return (scc_bfe_probe(dev)); From owner-p4-projects@FreeBSD.ORG Fri Feb 24 17:57: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 21A6E16A424; Fri, 24 Feb 2006 17:57:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB75716A422 for ; Fri, 24 Feb 2006 17:57:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DE2A43D45 for ; Fri, 24 Feb 2006 17:57:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OHvmI2013016 for ; Fri, 24 Feb 2006 17:57:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OHvmMi013013 for perforce@freebsd.org; Fri, 24 Feb 2006 17:57:48 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Feb 2006 17:57:48 GMT Message-Id: <200602241757.k1OHvmMi013013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92350 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, 24 Feb 2006 17:57:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92350 Change 92350 by kmacy@kmacy_storage:sun4v_work on 2006/02/24 17:57:18 switch over to new scratch accessor macros load_dw was faulting on storing to o2 for no apparent reason add save/restore to helper function Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#10 (text+ko) ==== @@ -69,7 +69,6 @@ #include "assym.s" -#include #define TSB_KERNEL_MASK 0x0 #define TSB_KERNEL 0x0 @@ -79,6 +78,12 @@ .register %g6,#ignore .register %g7,#ignore + +#define PCB_REG %g6 + +#include + + /* * Atomically set the reference bit in a tte. */ @@ -94,13 +99,6 @@ #define TTE_SET_REF(r1, r2, r3) TTE_SET_BIT(r1, r2, r3, TD_REF) #define TTE_SET_W(r1, r2, r3) TTE_SET_BIT(r1, r2, r3, TD_W) -#define LOAD_ALT \ - mov SCRATCH_REG_PCPU, %g0 ; \ - ldxa [%g0]ASI_SCRATCHPAD, PCPU_REG ; \ - mov SCRATCH_REG_PCB, %g0 ; \ - ldxa [%g0]ASI_SCRATCHPAD, PCB_REG - - /* * Macros for spilling and filling live windows. @@ -461,13 +459,16 @@ tl0_gen T_RESERVED .endr .endm + + .macro tl1_split #if 0 - .macro tl1_split rdpr %wstate, %g1 wrpr %g1, WSTATE_NESTED, %wstate save %sp, -(CCFSZ + TF_SIZEOF), %sp +#endif + nop .endm -#endif + .macro tl1_setup type tl1_split clr %o1 @@ -483,49 +484,67 @@ .macro tl1_reserved count .rept \count -#if 0 tl1_gen T_RESERVED -#endif .endr .endm .macro insn_excptn + nop .align 32 .endm .macro insn_miss + nop + mov %o0, %g6 + mov 0x23, %o0 + call hv_cnputchar + mov 0x24, %o0 + call hv_cnputchar .align 32 .endm .macro data_excptn + nop .align 32 .endm .macro data_miss + nop + mov %o0, %g6 + mov 0x23, %o0 + call hv_cnputchar + mov 0x24, %o0 + call hv_cnputchar .align 32 .endm .macro data_prot + nop .align 32 .endm .macro tl0_align + nop .align 32 .endm .macro cpu_mondo + nop .align 32 .endm .macro dev_mondo + nop .align 32 .endm .macro resumable_error + nop .align 32 .endm .macro nonresumable_error + nop .align 32 .endm @@ -581,7 +600,7 @@ retry ; \ .skip (31-25)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ - + .align 128 .macro spill_32bit_primary_sn0 spill_32bit_asi(ASI_AIUP, sn0) @@ -604,6 +623,11 @@ .endm .macro spill_64bit_nucleus_not + mov %o0, %g6 + mov 0x23, %o0 + call hv_cnputchar + mov 0x24, %o0 + call hv_cnputchar spill_64bit_asi(ASI_N,not) .endm @@ -628,6 +652,11 @@ .endm .macro fill_64bit_nucleus_not + mov %o0, %g6 + mov 0x23, %o0 + call hv_cnputchar + mov 0x24, %o0 + call hv_cnputchar fill_64bit_asi(ASI_N, not) .endm @@ -672,10 +701,12 @@ .endm .macro spill_mixed + nop .align 128 .endm .macro fill_mixed + nop .align 128 .endm @@ -729,6 +760,7 @@ .endm .macro tl0_immu_miss + nop .align 128 .endm @@ -1197,11 +1229,13 @@ nop .align 32 .endm + +ENTRY(tl0_fp_restore) + GET_PCB(PCB_REG) -ENTRY(tl0_fp_restore) - ldx [PCB_REG + PCB_FLAGS], %g1 + ldx [%g6 + PCB_FLAGS], %g1 andn %g1, PCB_FEF, %g1 - stx %g1, [PCB_REG + PCB_FLAGS] + stx %g1, [%g6 + PCB_FLAGS] wr %g0, FPRS_FEF, %fprs wr %g0, ASI_BLK_S, %asi @@ -1241,6 +1275,7 @@ bgeu,a,pn %xcc, 1f nop + GET_PCB(PCB_REG) wr %g0, FPRS_FEF, %fprs wr %g0, ASI_BLK_S, %asi ldda [PCB_REG + PCB_KFP + (0 * 64)] %asi, %f0 @@ -1666,7 +1701,7 @@ .sect .trap .align 0x8000 - .globl tl0_base + .globl tl0_base,tl0_insn_miss, tl0_insn_excptn, tl0_spill_n_normal tl0_base: tl0_reserved 8 ! 0x0-0x7 tl0_insn_excptn: @@ -1829,6 +1864,8 @@ tl1_reserved 32 ! 0x2c0-0x2df tl1_fill_n_other: tl1_reserved 32 ! 0x2e0-0x2ff +.globl tl0_end +tl0_end: /* * no discretionary traps at TL 1 - leaving us with a 24k trap table */ @@ -1901,8 +1938,10 @@ * user traps, which implies that the condition that caused the trap * in the first place is still valid, so it will occur again when we * re-execute the trapping instruction. - */ + */ +#if 0 ldx [PCB_REG + PCB_NSAVED], %l1 +#endif brnz,a,pn %l1, tl0_trap mov T_SPILL, %o0 @@ -1917,10 +1956,12 @@ rd %fprs, %l1 or %l1, FPRS_FEF, %l2 wr %l2, 0, %fprs +#if 0 dec 8, ASP_REG stx %fsr, [ASP_REG] ldx [ASP_REG], %l4 inc 8, ASP_REG +#endif wr %l1, 0, %fprs rdpr %tstate, %l5 @@ -1980,7 +2021,7 @@ * of cpu migration and using the wrong pcpup. */ ENTRY(tl0_trap) - LOAD_ALT + GET_PCB(PCB_REG) rdpr %tstate, %l0 rdpr %tpc, %l1 @@ -2038,7 +2079,7 @@ mov PCPU_REG, %l1 wrpr %g0, PSTATE_NORMAL, %pstate - stx %g6, [%sp + SPOFF + CCFSZ + TF_G6] + stx PCB_REG, [%sp + SPOFF + CCFSZ + TF_G6] stx %g7, [%sp + SPOFF + CCFSZ + TF_G7] mov %l0, PCB_REG @@ -2069,7 +2110,7 @@ * void tl0_intr(u_int level, u_int mask) */ ENTRY(tl0_intr) - LOAD_ALT + GET_PCB(PCB_REG) rdpr %tstate, %l0 rdpr %tpc, %l1 @@ -2228,7 +2269,9 @@ * spilled to the pcb, they will not be copied out and the stack will * be inconsistent. */ +#if 0 1: ldx [PCB_REG + PCB_NSAVED], %l1 +#endif brz,a,pt %l1, 2f nop wrpr %g0, 0, %pil @@ -2284,8 +2327,9 @@ * Switch to alternate globals. This frees up some registers we * can use after the restore changes our window. */ +#if 0 LOAD_ALT - +#endif /* * Drop %pil to zero. It must have been zero at the time of the * trap, since we were in usermode, but it was raised above in @@ -2438,7 +2482,7 @@ * kernel. We clobbered them above restoring the user's globals * so this is very important. */ - LOAD_ALT + GET_PCB(PCB_REG) mov PCB_REG, %o0 mov PCPU_REG, %o1 wrpr %g0, PSTATE_NORMAL, %pstate @@ -2571,8 +2615,10 @@ ldx [%sp + SPOFF + CCFSZ + TF_G6], %g6 ldx [%sp + SPOFF + CCFSZ + TF_G7], %g7 -1: LOAD_ALT - +1: +#if 0 + LOAD_ALT +#endif andn %l0, TSTATE_CWP_MASK, %g1 mov %l1, %g2 mov %l2, %g3 @@ -2704,9 +2750,9 @@ ldx [%sp + SPOFF + CCFSZ + TF_G3], %g3 ldx [%sp + SPOFF + CCFSZ + TF_G4], %g4 ldx [%sp + SPOFF + CCFSZ + TF_G5], %g5 - +#if 0 LOAD_ALT - +#endif andn %l0, TSTATE_CWP_MASK, %g1 mov %l1, %g2 mov %l2, %g3 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#5 (text+ko) ==== @@ -79,7 +79,7 @@ /* * Get onto thread0's kstack. */ - sub PCB_REG, SPOFF + CCFSZ, %sp + sub %g6, SPOFF + CCFSZ, %sp /* * And away we go. This doesn't return. @@ -105,7 +105,7 @@ * Normal %g6 points to the current thread's pcb, and %g7 points to * the per-cpu data structure. */ - mov %o1, PCB_REG + mov %o1, %g6 mov %o0, PCPU_REG /* @@ -116,7 +116,7 @@ mov SCRATCH_REG_PCPU, %g1 stxa PCPU_REG, [%g1]ASI_SCRATCHPAD mov SCRATCH_REG_PCB, %g1 - stxa PCB_REG, [%g1]ASI_SCRATCHPAD + stxa %g6, [%g1]ASI_SCRATCHPAD retl nop ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#5 (text+ko) ==== @@ -679,10 +679,13 @@ */ ENTRY(load_real_dw) - ldda [%g0 + %o0]ASI_LDTD_REAL, %o0 - stx %o0, [%o1] + save %sp, -SA(MINFRAME64), %sp + ldda [%g0 + %i0]ASI_LDTD_REAL, %l0 + stx %l0, [%i1] + stx %l1, [%i2] + restore retl - stx %o1, [%o2] + nop END(load_real_dw) /* @@ -741,8 +744,35 @@ retl nop END(invltlb) + +! %o0 = pa +! %o1 = size +ENTRY(bzerophyspage) + save %sp, -SA(MINFRAME64), %sp + mov 8, %l1 + mov 16, %l2 + mov 24, %l3 + mov 32, %l4 + mov 40, %l5 + mov 48, %l6 + mov 56, %l7 +1: stxa %g0, [%i0]ASI_REAL + stxa %g0, [%i0 + %l1]ASI_REAL + stxa %g0, [%i0 + %l2]ASI_REAL + stxa %g0, [%i0 + %l3]ASI_REAL + stxa %g0, [%i0 + %l4]ASI_REAL + stxa %g0, [%i0 + %l5]ASI_REAL + stxa %g0, [%i0 + %l6]ASI_REAL + stxa %g0, [%i0 + %l7]ASI_REAL + sub %i1, 64, %i1 + brnz,pt %i1, 1b + add %i0, 64, %i0 + membar #Sync + retl + restore +END(bzerophyspage) #ifdef GPROF ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#5 (text+ko) ==== @@ -37,6 +37,9 @@ .register %g2, #ignore .register %g3, #ignore +#define PCB_REG %g6 + + /* * void cpu_throw(struct thread *old, struct thread *new) */ @@ -51,6 +54,7 @@ * void cpu_switch(struct thread *old, struct thread *new) */ ENTRY(cpu_switch) + GET_PCB(PCB_REG) save %sp, -CCFSZ, %sp mov %i1, %i0 From owner-p4-projects@FreeBSD.ORG Fri Feb 24 18:01: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 A958A16A424; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5315916A420 for ; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0890143D45 for ; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OI1sA4013240 for ; Fri, 24 Feb 2006 18:01:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OI1rSF013237 for perforce@freebsd.org; Fri, 24 Feb 2006 18:01:53 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Feb 2006 18:01:53 GMT Message-Id: <200602241801.k1OI1rSF013237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92351 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, 24 Feb 2006 18:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92351 Change 92351 by kmacy@kmacy_storage:sun4v_work on 2006/02/24 18:01:31 fix up TSB get / set functions switch to using hv_tsb_info structures make clearer which kernel TSB we're referencing Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#4 (text+ko) ==== @@ -75,13 +75,13 @@ +struct hv_tsb_info; +void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); -void tsb_set_tte(tsb_info_t tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); +uint64_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va, uint64_t ctx); -tte_t tsb_get_tte(tsb_info_t tsb, vm_offset_t va, uint64_t ctx); - -void tsb_clear_tte(tsb_info_t tsb, vm_offset_t, uint64_t ctx); +void tsb_clear_tte(struct hv_tsb_info *tsb, vm_offset_t, uint64_t ctx); #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#4 (text+ko) ==== @@ -34,7 +34,6 @@ #define TTE_SHIFT (4) -#define TD_SIZE_SHIFT (61) #define TD_SOFT2_SHIFT (50) #define TD_DIAG_SHIFT (41) #define TD_PA_SHIFT (13) @@ -42,7 +41,7 @@ #define TD_SOFT2_BITS (9) #define TD_DIAG_BITS (9) -#define TD_PA_BITS (28) +#define TD_PA_BITS (42) #define TD_SOFT_BITS (6) #define TD_SOFT2_MASK ((1UL << TD_SOFT2_BITS) - 1) @@ -59,13 +58,6 @@ #define TTE2G (6UL) #define TTE16G (7UL) -#define TD_V (1UL << 63) -#define TD_8K (TS_8K << TD_SIZE_SHIFT) -#define TD_64K (TS_64K << TD_SIZE_SHIFT) -#define TD_512K (TS_512K << TD_SIZE_SHIFT) -#define TD_4M (TS_4M << TD_SIZE_SHIFT) -#define TD_NFO (1UL << 60) -#define TD_IE (1UL << 59) #define TD_PA(pa) ((pa) & (TD_PA_MASK << TD_PA_SHIFT)) /* NOTE: bit 6 of TD_SOFT will be sign-extended if used as an immediate. */ #define TD_FAKE ((1UL << 5) << TD_SOFT_SHIFT) @@ -83,21 +75,13 @@ #define TD_G (1UL << 0) -#define TTE_SIZE_SPREAD (3) -#define TTE_PAGE_SHIFT(sz) \ - (PAGE_SHIFT + ((sz) * TTE_SIZE_SPREAD)) - -#define TTE_GET_SIZE(tp) \ - (((tp)->tte_data >> TD_SIZE_SHIFT) & TD_SIZE_MASK) -#define TTE_GET_PAGE_SHIFT(tp) \ - TTE_PAGE_SHIFT(TTE_GET_SIZE(tp)) #define TTE_GET_PAGE_SIZE(tp) \ (1 << TTE_GET_PAGE_SHIFT(tp)) #define TTE_GET_PAGE_MASK(tp) \ (TTE_GET_PAGE_SIZE(tp) - 1) -#define TTE_GET_PA(tp) \ - ((tp)->tte_data & (TD_PA_MASK << TD_PA_SHIFT)) +#define TTE_GET_PA(tte_data) \ + (tte_data & (TD_PA_MASK << TD_PA_SHIFT)) #define TTE_GET_VPN(tp) \ ((tp)->tte_vpn >> TV_SIZE_BITS) #define TTE_GET_VA(tp) \ @@ -144,6 +128,18 @@ */ #define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W +#define VTD_SIZE_BITS (4) +#define VTD_SIZE_MASK ((1 << VTD_SIZE_BITS) - 1) + + +#define TTE_SIZE_SPREAD (3) +#define TTE_PAGE_SHIFT(sz) \ + (PAGE_SHIFT + ((sz) * TTE_SIZE_SPREAD)) +#define TTE_GET_SIZE(tte_data) \ + (tte_data & VTD_SIZE_MASK) +#define TTE_GET_PAGE_SHIFT(tte_data) \ + TTE_PAGE_SHIFT(TTE_GET_SIZE(tte_data)) + typedef union { struct tte { ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#10 (text+ko) ==== @@ -103,6 +103,8 @@ /* * Kernel TSBs */ +#define TSB8K_INDEX 0 +#define TSB4M_INDEX 1 static struct tsb_info kernel_tsbs[MAX_TSB_INFO]; static hv_tsb_info_t kernel_td[MAX_TSB_INFO]; @@ -135,7 +137,7 @@ #define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) - +static void pmap_scrub_pages(vm_paddr_t pa, int64_t size); /* * Quick sort callout for comparing memory regions. */ @@ -204,7 +206,6 @@ void pmap_activate(struct thread *td) { - struct proc *p = td->td_proc; pmap_t pmap, oldpmap; critical_enter(); @@ -218,18 +219,6 @@ pmap->pm_active |= 1; #endif - - /* XXX complains of incomplete type in spite of being defined */ - if (p->p_flag & P_SA) { - /* Make sure all other cr3 entries are updated. */ - /* what if they are running? XXXKSE (maybe abort them) */ - FOREACH_THREAD_IN_PROC(p, td) { - td->td_pcb->pcb_pdir = pmap->pm_pdir; - } - } else { - td->td_pcb->pcb_pdir = pmap->pm_pdir; - } - set_pdir_scratchpad(pmap->pm_pdir); PCPU_SET(curpmap, pmap); critical_exit(); @@ -250,7 +239,7 @@ struct pmap *pm; vm_offset_t off, va; vm_paddr_t pa; - vm_size_t physsz, virtsz, scrubbed; + vm_size_t physsz, virtsz; ihandle_t pmem, vmem; int i, sz, j; uint64_t tsb_8k_size, tsb_4m_size, error; @@ -298,8 +287,6 @@ } physmem = btoc(physsz); - - /* * Calculate the size of kernel virtual memory, and the size and mask * for the kernel tsb. @@ -311,55 +298,47 @@ pa = pmap_bootstrap_alloc(tsb_8k_size); if (pa & PAGE_MASK_4M) panic("pmap_bootstrap: tsb unaligned\n"); - kernel_tsbs[0].tsb_pa = pa; - kernel_tsbs[0].tsb_szc = (tsb_8k_size >> (PAGE_SHIFT - TTE_SHIFT)); - kernel_tsbs[0].tsb_ttesz_mask = TSB8K; + kernel_tsbs[TSB8K_INDEX].tsb_pa = pa; + kernel_tsbs[TSB8K_INDEX].tsb_szc = (tsb_8k_size >> (PAGE_SHIFT - TTE_SHIFT)); + kernel_tsbs[TSB8K_INDEX].tsb_ttesz_mask = TSB8K; tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); pa = pmap_bootstrap_alloc(tsb_4m_size); - kernel_tsbs[1].tsb_pa = pa; - kernel_tsbs[1].tsb_szc = (tsb_4m_size >> (PAGE_SHIFT - TTE_SHIFT)); - kernel_tsbs[1].tsb_ttesz_mask = TSB4M; + kernel_tsbs[TSB4M_INDEX].tsb_pa = pa; + kernel_tsbs[TSB4M_INDEX].tsb_szc = (tsb_4m_size >> (PAGE_SHIFT - TTE_SHIFT)); + kernel_tsbs[TSB4M_INDEX].tsb_ttesz_mask = TSB4M; + - error = hv_mem_scrub(kernel_tsbs[0].tsb_pa, tsb_8k_size, &scrubbed); - if (scrubbed != tsb_8k_size || error) - panic("unexpected return from mem_scrub - expected size: %ld - got size: %ld - error: %ld", - tsb_8k_size, scrubbed, error); + pmap_scrub_pages(kernel_tsbs[TSB8K_INDEX].tsb_pa, tsb_8k_size); - error = hv_mem_scrub(kernel_tsbs[1].tsb_pa, tsb_4m_size, &scrubbed); - if (scrubbed != tsb_8k_size || error) - panic("unexpected return from mem_scrub - expected size: %ld - got size: %ld - error: %ld", - tsb_4m_size, scrubbed, error); + pmap_scrub_pages(kernel_tsbs[TSB4M_INDEX].tsb_pa, tsb_4m_size); /* * Set up TSB descriptors for the hypervisor * */ - kernel_td[0].hvtsb_idxpgsz = TTE8K; - kernel_td[0].hvtsb_assoc = 1; - kernel_td[0].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[0].tsb_szc); - kernel_td[0].hvtsb_ctx_index = 0; - kernel_td[0].hvtsb_pgszs = kernel_tsbs[0].tsb_ttesz_mask; - kernel_td[0].hvtsb_rsvd = 0; - kernel_td[0].hvtsb_pa = kernel_tsbs[0].tsb_pa; + kernel_td[TSB8K_INDEX].hvtsb_idxpgsz = TTE8K; + kernel_td[TSB8K_INDEX].hvtsb_assoc = 1; + kernel_td[TSB8K_INDEX].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[TSB8K_INDEX].tsb_szc); + kernel_td[TSB8K_INDEX].hvtsb_ctx_index = 0; + kernel_td[TSB8K_INDEX].hvtsb_pgszs = kernel_tsbs[TSB8K_INDEX].tsb_ttesz_mask; + kernel_td[TSB8K_INDEX].hvtsb_rsvd = 0; + kernel_td[TSB8K_INDEX].hvtsb_pa = kernel_tsbs[TSB8K_INDEX].tsb_pa; - kernel_td[1].hvtsb_idxpgsz = TTE4M; - kernel_td[1].hvtsb_assoc = 1; - kernel_td[1].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[1].tsb_szc); - kernel_td[1].hvtsb_ctx_index = 0; - kernel_td[1].hvtsb_pgszs = kernel_tsbs[1].tsb_ttesz_mask; - kernel_td[1].hvtsb_rsvd = 0; - kernel_td[1].hvtsb_pa = kernel_tsbs[1].tsb_pa; + kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M; + kernel_td[TSB4M_INDEX].hvtsb_assoc = 1; + kernel_td[TSB4M_INDEX].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[TSB4M_INDEX].tsb_szc); + kernel_td[TSB4M_INDEX].hvtsb_ctx_index = 0; + kernel_td[TSB4M_INDEX].hvtsb_pgszs = kernel_tsbs[TSB4M_INDEX].tsb_ttesz_mask; + kernel_td[TSB4M_INDEX].hvtsb_rsvd = 0; + kernel_td[TSB4M_INDEX].hvtsb_pa = kernel_tsbs[TSB4M_INDEX].tsb_pa; - error = hv_set_ctx0(2, OF_vtophys((vm_offset_t)&kernel_td)); - - if (error != H_EOK) - panic("failed to set ctx0 TSBs error: %ld", error); /* * allocate MMU fault status areas for all CPUS */ + printf("allocate fault status area\n"); mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); /* @@ -368,6 +347,13 @@ msgbuf_phys = pmap_bootstrap_alloc(MSGBUF_SIZE); msgbufp = (struct msgbuf *)TLB_PHYS_TO_DIRECT(msgbuf_phys); +#ifdef notyet + /* XXX this tries to map at a wacky address */ + for (i = 0; i < (MSGBUF_SIZE / PAGE_SIZE); i++) + tsb_set_tte(&kernel_td[TSB8K_INDEX], ((vm_offset_t)msgbufp) + i*PAGE_SIZE , msgbuf_phys + i*PAGE_SIZE, + TTE_KERNEL | VTD_8K, 0); +#endif + /* * Set the start and end of kva. The kernel is loaded at the first * available 4 meg super page, so round up to the end of the page. @@ -385,10 +371,11 @@ virtual_avail += KSTACK_GUARD_PAGES * PAGE_SIZE; kstack0 = virtual_avail; virtual_avail += KSTACK_PAGES * PAGE_SIZE; + printf("setting ttes\n"); for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; - UNIMPLEMENTED; + tsb_set_tte(&kernel_td[TSB8K_INDEX], va , pa, TTE_KERNEL | VTD_8K, 0); } /* @@ -419,17 +406,23 @@ "translation: start=%#lx size=%#lx tte=%#lx", translations[i].om_start, translations[i].om_size, translations[i].om_tte); +#if 0 if (translations[i].om_start < VM_MIN_PROM_ADDRESS || translations[i].om_start > VM_MAX_PROM_ADDRESS) continue; - for (off = 0; off < translations[i].om_size; - off += PAGE_SIZE) { - va = translations[i].om_start + off; - pa = ((translations[i].om_tte & - ~(TD_SOFT_MASK << TD_SOFT_SHIFT)) | TD_EXEC) + - off; - tsb_set_tte(&kernel_tsbs[0], va, pa, 0/* XXX ADD FLAGS */, 0); - } +#endif + printf("om_size: %ld om_start: %lx om_tte: %lx\n", translations[i].om_size, + translations[i].om_start, translations[i].om_tte); + if (translations[i].om_size == PAGE_SIZE_4M) + tsb_set_tte(&kernel_td[TSB4M_INDEX], translations[i].om_start, + TTE_GET_PA(translations[i].om_tte), TTE_KERNEL | VTD_4M, 0); + else + for (off = 0; off < translations[i].om_size; + off += PAGE_SIZE) { + va = translations[i].om_start + off; + pa = TTE_GET_PA(translations[i].om_tte) + off; + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); + } } /* @@ -450,6 +443,14 @@ PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvlist); + + printf("physical address of kernel_td: 0x%lx\n", vtophys((vm_offset_t)&kernel_td)); + printf("set ctx0\n"); + error = hv_set_ctx0(2, vtophys((vm_offset_t)&kernel_td)); + printf("ctx0 set\n"); + if (error != H_EOK) + panic("failed to set ctx0 TSBs error: %ld", error); + } @@ -584,7 +585,7 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - UNIMPLEMENTED; + printf("%s unimplemented\n", __FUNCTION__); } @@ -617,41 +618,47 @@ void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - tsb_set_tte(&kernel_tsbs[1], va, pa, TTE_KERNEL | VTD_8K, 0); + printf("pmap_kentering\n"); + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); + printf("pmap_kentered\n"); } /* * Extract the physical page address associated with the given kernel virtual * address. */ + vm_paddr_t pmap_kextract(vm_offset_t va) { - tte_t tte; + uint64_t tte_data; vm_paddr_t pa; - /* - * check 8k TSB + * check 4M TSB */ - tte = tsb_get_tte(&kernel_tsbs[1], va, 0); - pa = tte.tte_bit.pa << PAGE_SHIFT; - if (pa != 0) + tte_data = tsb_get_tte(&kernel_td[TSB4M_INDEX], va, 0); + pa = TTE_GET_PA(tte_data) | (va & PAGE_MASK_4M); + if (TTE_GET_PA(tte_data) != 0) goto done; /* - * check 4M TSB + * check 8k TSB */ - tte = tsb_get_tte(&kernel_tsbs[0], va, 0); - pa = tte.tte_bit.pa << PAGE_SHIFT; + tte_data = tsb_get_tte(&kernel_td[TSB8K_INDEX], va, 0); + pa = TTE_GET_PA(tte_data)| (va & PAGE_MASK); done: - return pa; } void pmap_kremove(vm_offset_t va) -{ - tsb_set_tte(&kernel_tsbs[1], va, 0, 0, 0); +{ + + if ((va & PAGE_MASK_4M) == 0 && + tsb_get_tte(&kernel_td[TSB4M_INDEX], va, 0) != 0) + tsb_set_tte(&kernel_td[TSB4M_INDEX], va, 0, 0, 0); + else + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, 0, 0, 0); } static void @@ -1053,6 +1060,18 @@ { UNIMPLEMENTED; } + +static void +pmap_scrub_pages(vm_paddr_t pa, int64_t size) +{ + uint64_t bytes_zeroed; + while (size > 0) { + hv_mem_scrub(pa, size, &bytes_zeroed); + pa += bytes_zeroed; + size -= bytes_zeroed; + } +} + /* * Set the 2 global kernel TSBs and the per-cpu user TSB * ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#3 (text+ko) ==== @@ -192,5 +192,5 @@ void tick_stop(void) { - UNIMPLEMENTED; + } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#4 (text+ko) ==== @@ -45,52 +45,65 @@ #include #include +#include #include #include #include #include CTASSERT(sizeof(tte_t) == sizeof(uint64_t)); - +#define TSB_MASK(tsb) (((tsb->hvtsb_ntte) << (PAGE_SHIFT - TTE_SHIFT)) - 1) +#ifdef DEBUG_TSB +#define DPRINTF printf +#else +#define DPRINTF(...) +#endif void -tsb_set_tte(tsb_info_t tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx) +tsb_set_tte(hv_tsb_info_t *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx) { vm_paddr_t tsb_store_pa; - uint64_t tsb_index, tsb_shift, tte_tag; - tte_t data; + uint64_t tsb_index, tsb_shift, tte_tag, tte_data; + DPRINTF("tsb_set_tte va: 0x%lx idxpgsz: %x\n", va, tsb->hvtsb_idxpgsz); + tsb_shift = TTE_GET_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + DPRINTF("tsb_shift: 0x%lx\n", tsb_shift); + tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); + DPRINTF("tsb_index_absolute: 0x%lx tsb_index: 0x%lx\n", (va >> tsb_shift), tsb_index); + tsb_store_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); - tsb_shift = TTE_BSZS_SHIFT(tsb->tsb_ttesz_mask) + PAGE_SHIFT; - tsb_index = (va >> tsb_shift) % (tsb->tsb_szc << (PAGE_SHIFT - TTE_SHIFT)); - tsb_store_pa = tsb->tsb_pa + 2*tsb_index*sizeof(uint64_t); + tte_data = pa | flags; - data.ll = pa | flags; - data.tte_bit.v = 0; + tte_data &= ~VTD_V; /* store new value with valid bit cleared * to avoid invalid intermediate value; */ - store_real(tsb_store_pa + sizeof(uint64_t), data.ll); + store_real(tsb_store_pa + sizeof(uint64_t), tte_data); + tte_data |= VTD_V; - data.tte_bit.v = 1; tte_tag = (ctx << TTARGET_CTX_SHIFT) | (va >> TTARGET_VA_SHIFT); store_real(tsb_store_pa, tte_tag); - store_real_sync(tsb_store_pa + sizeof(uint64_t), data.ll); + store_real_sync(tsb_store_pa + sizeof(uint64_t), tte_data); } -tte_t -tsb_get_tte(tsb_info_t tsb, vm_offset_t va, uint64_t ctx) +uint64_t +tsb_get_tte(hv_tsb_info_t *tsb, vm_offset_t va, uint64_t ctx) { vm_paddr_t tsb_load_pa; - uint64_t tsb_index, tsb_shift, tte_tag; - tte_t data; + uint64_t tsb_index, tsb_shift, tte_tag, tte_data; - tsb_shift = TTE_BSZS_SHIFT(tsb->tsb_ttesz_mask) + PAGE_SHIFT; - tsb_index = (va >> tsb_shift) % (tsb->tsb_szc << (PAGE_SHIFT - TTE_SHIFT)); - tsb_load_pa = tsb->tsb_pa + 2*tsb_index*sizeof(uint64_t); + DPRINTF("tsb_get_tte va: 0x%lx\n", va); + tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + DPRINTF("tsb_shift: %lx\n", tsb_shift); + tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); + DPRINTF("tsb_index_absolute: %lx tsb_index: %lx\n", (va >> tsb_shift), tsb_index); + tsb_load_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); - load_real_dw(tsb_load_pa, &tte_tag, &data.ll); - if ((tte_tag >> TTARGET_CTX_SHIFT) == ctx && (tte_tag << TTARGET_VA_SHIFT) == va) - return data; + DPRINTF("load_real_dw - ra: %lx &tte_tag: %p &tte_data: %p \n", tsb_load_pa, &tte_tag, &tte_data); + load_real_dw(tsb_load_pa, &tte_tag, &tte_data); + DPRINTF("tte_data: %lx ctx: %lx va: %lx\n", tte_data, tte_tag >> TTARGET_CTX_SHIFT, + tte_tag << TTARGET_VA_SHIFT); + if ((tte_tag >> TTARGET_CTX_SHIFT) == ctx && (tte_tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) + return tte_data; - return ((tte_t)0UL); + return (0UL); } From owner-p4-projects@FreeBSD.ORG Fri Feb 24 18:01:56 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 EEDF816A43E; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A015716A422 for ; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B31143D46 for ; Fri, 24 Feb 2006 18:01:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OI1sMO013246 for ; Fri, 24 Feb 2006 18:01:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OI1sem013243 for perforce@freebsd.org; Fri, 24 Feb 2006 18:01:54 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 18:01:54 GMT Message-Id: <200602241801.k1OI1sem013243@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 92352 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, 24 Feb 2006 18:01:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92352 Change 92352 by marcel@marcel_nfs on 2006/02/24 18:01:44 Build scc(1) as a module. Affected files ... .. //depot/projects/uart/modules/Makefile#26 edit .. //depot/projects/uart/modules/scc/Makefile#1 add Differences ... ==== //depot/projects/uart/modules/Makefile#26 (text+ko) ==== @@ -206,6 +206,7 @@ ${_safe} \ ${_sbni} \ sbsh \ + scc \ scd \ ${_scsi_low} \ sf \ From owner-p4-projects@FreeBSD.ORG Fri Feb 24 18:06: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 200BE16A423; Fri, 24 Feb 2006 18:06:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F00D316A420 for ; Fri, 24 Feb 2006 18:05:59 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF27E43D46 for ; Fri, 24 Feb 2006 18:05:59 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OI5xa5013436 for ; Fri, 24 Feb 2006 18:05:59 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OI5xki013433 for perforce@freebsd.org; Fri, 24 Feb 2006 18:05:59 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 18:05:59 GMT Message-Id: <200602241805.k1OI5xki013433@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 92353 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, 24 Feb 2006 18:06:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=92353 Change 92353 by marcel@marcel_nfs on 2006/02/24 18:05:57 Build the scc(4) attachment into the uart(4) module. Affected files ... .. //depot/projects/uart/modules/uart/Makefile#14 edit Differences ... ==== //depot/projects/uart/modules/uart/Makefile#14 (text+ko) ==== @@ -9,14 +9,15 @@ KMOD= uart SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ - uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \ - uart_dbg.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ - uart_if.c uart_subr.c uart_tty.c + uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ + uart_core.c uart_cpu_${MACHINE}.c uart_dbg.c \ + uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ + uart_if.c uart_if.h uart_subr.c uart_tty.c SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \ - power_if.h uart_if.h pccarddevs.h + power_if.h pccarddevs.h serdev_if.h MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \ - kern/device_if.m + kern/device_if.m kern/serdev_if.m .include From owner-p4-projects@FreeBSD.ORG Fri Feb 24 18:17: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 C39D216A425; Fri, 24 Feb 2006 18:17:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6841216A422 for ; Fri, 24 Feb 2006 18:17:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127A543D46 for ; Fri, 24 Feb 2006 18:17:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OIHDvg013861 for ; Fri, 24 Feb 2006 18:17:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OIHDU5013858 for perforce@freebsd.org; Fri, 24 Feb 2006 18:17:13 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Feb 2006 18:17:13 GMT Message-Id: <200602241817.k1OIHDU5013858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92354 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, 24 Feb 2006 18:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=92354 Change 92354 by kmacy@kmacy_storage:sun4v_work on 2006/02/24 18:16:38 remove duplicated tsb_info structure Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#5 (text+ko) ==== @@ -64,17 +64,6 @@ #define TSB32M (1 << TTE32M) #define TSB256M (1 << TTE256M) - -typedef struct tsb_info { - vm_offset_t tsb_va; - vm_paddr_t tsb_pa; /* tsb physical address */ - uint16_t tsb_szc; /* tsb size code */ - uint16_t tsb_flags; - uint32_t tsb_ttesz_mask; /* page size masks */ -} *tsb_info_t; - - - struct hv_tsb_info; void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#11 (text+ko) ==== @@ -106,7 +106,6 @@ #define TSB8K_INDEX 0 #define TSB4M_INDEX 1 -static struct tsb_info kernel_tsbs[MAX_TSB_INFO]; static hv_tsb_info_t kernel_td[MAX_TSB_INFO]; @@ -298,41 +297,36 @@ pa = pmap_bootstrap_alloc(tsb_8k_size); if (pa & PAGE_MASK_4M) panic("pmap_bootstrap: tsb unaligned\n"); - kernel_tsbs[TSB8K_INDEX].tsb_pa = pa; - kernel_tsbs[TSB8K_INDEX].tsb_szc = (tsb_8k_size >> (PAGE_SHIFT - TTE_SHIFT)); - kernel_tsbs[TSB8K_INDEX].tsb_ttesz_mask = TSB8K; + kernel_td[TSB8K_INDEX].hvtsb_idxpgsz = TTE8K; + kernel_td[TSB8K_INDEX].hvtsb_assoc = 1; + kernel_td[TSB8K_INDEX].hvtsb_ntte = (tsb_8k_size >> TTE_SHIFT); + kernel_td[TSB8K_INDEX].hvtsb_ctx_index = 0; + kernel_td[TSB8K_INDEX].hvtsb_pgszs = TSB8K; + kernel_td[TSB8K_INDEX].hvtsb_rsvd = 0; + kernel_td[TSB8K_INDEX].hvtsb_pa = pa; tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); pa = pmap_bootstrap_alloc(tsb_4m_size); - kernel_tsbs[TSB4M_INDEX].tsb_pa = pa; - kernel_tsbs[TSB4M_INDEX].tsb_szc = (tsb_4m_size >> (PAGE_SHIFT - TTE_SHIFT)); - kernel_tsbs[TSB4M_INDEX].tsb_ttesz_mask = TSB4M; + kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M; + kernel_td[TSB4M_INDEX].hvtsb_assoc = 1; + kernel_td[TSB4M_INDEX].hvtsb_ntte = (tsb_4m_size >> TTE_SHIFT); + kernel_td[TSB4M_INDEX].hvtsb_ctx_index = 0; + kernel_td[TSB4M_INDEX].hvtsb_pgszs = TSB4M; + kernel_td[TSB4M_INDEX].hvtsb_rsvd = 0; + kernel_td[TSB4M_INDEX].hvtsb_pa = pa; - pmap_scrub_pages(kernel_tsbs[TSB8K_INDEX].tsb_pa, tsb_8k_size); + pmap_scrub_pages(kernel_td[TSB8K_INDEX].hvtsb_pa, tsb_8k_size); - pmap_scrub_pages(kernel_tsbs[TSB4M_INDEX].tsb_pa, tsb_4m_size); + pmap_scrub_pages(kernel_td[TSB4M_INDEX].hvtsb_pa, tsb_4m_size); /* * Set up TSB descriptors for the hypervisor * */ - kernel_td[TSB8K_INDEX].hvtsb_idxpgsz = TTE8K; - kernel_td[TSB8K_INDEX].hvtsb_assoc = 1; - kernel_td[TSB8K_INDEX].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[TSB8K_INDEX].tsb_szc); - kernel_td[TSB8K_INDEX].hvtsb_ctx_index = 0; - kernel_td[TSB8K_INDEX].hvtsb_pgszs = kernel_tsbs[TSB8K_INDEX].tsb_ttesz_mask; - kernel_td[TSB8K_INDEX].hvtsb_rsvd = 0; - kernel_td[TSB8K_INDEX].hvtsb_pa = kernel_tsbs[TSB8K_INDEX].tsb_pa; + - kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M; - kernel_td[TSB4M_INDEX].hvtsb_assoc = 1; - kernel_td[TSB4M_INDEX].hvtsb_ntte = TSB_ENTRIES(kernel_tsbs[TSB4M_INDEX].tsb_szc); - kernel_td[TSB4M_INDEX].hvtsb_ctx_index = 0; - kernel_td[TSB4M_INDEX].hvtsb_pgszs = kernel_tsbs[TSB4M_INDEX].tsb_ttesz_mask; - kernel_td[TSB4M_INDEX].hvtsb_rsvd = 0; - kernel_td[TSB4M_INDEX].hvtsb_pa = kernel_tsbs[TSB4M_INDEX].tsb_pa; /* From owner-p4-projects@FreeBSD.ORG Fri Feb 24 20:11: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 DAEDA16A423; Fri, 24 Feb 2006 20:11:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9894216A420 for ; Fri, 24 Feb 2006 20:11:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51A0943D48 for ; Fri, 24 Feb 2006 20:11:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OKBVZt020147 for ; Fri, 24 Feb 2006 20:11:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OKBVdM020143 for perforce@freebsd.org; Fri, 24 Feb 2006 20:11:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Feb 2006 20:11:31 GMT Message-Id: <200602242011.k1OKBVdM020143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92355 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, 24 Feb 2006 20:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92355 Change 92355 by jhb@jhb_slimer on 2006/02/24 20:11:28 Allow a PHOLD() of curproc at any time. Affected files ... .. //depot/projects/smpng/sys/sys/proc.h#164 edit Differences ... ==== //depot/projects/smpng/sys/sys/proc.h#164 (text+ko) ==== @@ -792,7 +792,8 @@ } while (0) #define _PHOLD(p) do { \ PROC_LOCK_ASSERT((p), MA_OWNED); \ - KASSERT(!((p)->p_flag & P_WEXIT), ("PHOLD of exiting process"));\ + KASSERT(!((p)->p_flag & P_WEXIT) || (p) == curproc, \ + ("PHOLD of exiting process")); \ (p)->p_lock++; \ if (((p)->p_sflag & PS_INMEM) == 0) \ faultin((p)); \ From owner-p4-projects@FreeBSD.ORG Fri Feb 24 22:33:46 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 2982516A42B; Fri, 24 Feb 2006 22:33:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE1EC16A426 for ; Fri, 24 Feb 2006 22:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9128643D45 for ; Fri, 24 Feb 2006 22:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OMXjid034402 for ; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OMXjX8034399 for perforce@freebsd.org; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Date: Fri, 24 Feb 2006 22:33:45 GMT Message-Id: <200602242233.k1OMXjX8034399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92358 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, 24 Feb 2006 22:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92358 Change 92358 by millert@millert_g4tower on 2006/02/24 22:32:55 Revert debugging code from last change here that was unintentionally submitted. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 (text+ko) ==== @@ -116,8 +116,6 @@ int sebsd_verbose = 0; -static struct label *last_dead_cred_label, *last_dead_task_label, *last_dead_port_label; // XXX - testing - static int slot = 1; /* TBD, dynamic */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -485,24 +483,6 @@ static void sebsd_destroy_cred_label(struct label *label) { - // printk("sebsd_destroy_cred_label(%p)\n", &LABEL_TO_SLOT((label), slot)); - last_dead_cred_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_task_label(struct label *label) -{ - last_dead_task_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_port_label(struct label *label) -{ - last_dead_port_label = label; sebsd_free (SLOT(label)); SLOT(label) = NULL; } @@ -2363,13 +2343,7 @@ { struct task_security_struct *task; - /* XXX - SLOT should not return NULL but there is a signal race */ - /* XXX - this may be fixed... */ - if ((task = SLOT(label)) == NULL) { - printk("sebsd_externalize_cred_label: SLOT returned NULL!\n"); - printk("label: %p, last_task: %p, last_cred: %p, last_port: %p\n", label, last_dead_task_label, last_dead_cred_label, last_dead_port_label); // XXX - return (ESRCH); - } + task = SLOT(label); return (sebsd_externalize_sid(task->sid, element_name, sb)); } @@ -2665,8 +2639,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_task_label, - .mpo_destroy_port_label = sebsd_destroy_port_label, + .mpo_destroy_task_label = sebsd_destroy_cred_label, + .mpo_destroy_port_label = sebsd_destroy_cred_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, From owner-p4-projects@FreeBSD.ORG Fri Feb 24 22:48:08 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 001A316A42C; Fri, 24 Feb 2006 22:48:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B083F16A420 for ; Fri, 24 Feb 2006 22:48:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2AC343D45 for ; Fri, 24 Feb 2006 22:47:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OMluwH036018 for ; Fri, 24 Feb 2006 22:47:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OMltXS036013 for perforce@freebsd.org; Fri, 24 Feb 2006 22:47:55 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Feb 2006 22:47:55 GMT Message-Id: <200602242247.k1OMltXS036013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 92361 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, 24 Feb 2006 22:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92361 Change 92361 by jhb@jhb_slimer on 2006/02/24 22:47:50 IFC @92359. Affected files ... .. //depot/projects/smpng/sys/conf/kmod.mk#56 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#44 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#64 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#31 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#22 integrate .. //depot/projects/smpng/sys/dev/ic/z8530.h#3 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#10 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#17 integrate .. //depot/projects/smpng/sys/i386/include/mptable.h#4 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#118 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#122 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#99 integrate .. //depot/projects/smpng/sys/modules/Makefile#117 integrate .. //depot/projects/smpng/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/uart/Makefile#8 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#46 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#81 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#39 integrate .. //depot/projects/smpng/sys/sys/serial.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/conf/kmod.mk#56 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.205 2006/02/20 01:08:33 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.206 2006/02/24 01:49:36 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -320,7 +320,7 @@ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ - dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \ + dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/usb/usb_if.m isa/isa_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ ==== //depot/projects/smpng/sys/dev/amr/amr_linux.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.1 2006/01/24 21:13:49 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.2 2006/02/23 18:05:38 jhb Exp $"); #include #include @@ -170,13 +170,15 @@ devclass_t devclass; struct amr_softc *sc; struct amr_linux_ioctl ali; - int adapter; + int adapter, error; devclass = devclass_find("amr"); if (devclass == NULL) return (ENOENT); - copyin((caddr_t)args->arg, &ali, sizeof(ali)); + error = copyin((caddr_t)args->arg, &ali, sizeof(ali)); + if (error) + return (error); if (ali.ui.fcs.opcode == 0x82) adapter = 0; else ==== //depot/projects/smpng/sys/dev/ata/ata-all.h#44 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-all.h,v 1.113 2006/02/09 20:54:42 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.114 2006/02/23 20:15:22 sos Exp $ */ /* ATA register defines */ @@ -338,6 +338,7 @@ /* structure used to queue an ATA/ATAPI request */ struct ata_request { device_t dev; /* device handle */ + device_t parent; /* channel handle */ union { struct { u_int8_t command; /* command reg */ ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#64 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.159 2006/02/16 17:09:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.160 2006/02/23 18:52:15 sos Exp $"); #include "opt_ata.h" #include @@ -4075,7 +4075,6 @@ /* setup the usual register normal pci style */ if (ata_pci_allocate(dev)) return ENXIO; - ata_pci_allocate(dev); if (ctlr->chip->cfg2 & SIIINTR) ch->hw.status = ata_cmd_status; ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.55 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.56 2006/02/23 20:15:22 sos Exp $"); #include "opt_ata.h" #include @@ -55,6 +55,7 @@ /* mark request as virgin (this might be a ATA_R_REQUEUE) */ request->result = request->status = request->error = 0; + request->parent = device_get_parent(request->dev); callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED); if (!request->callback && !(request->flags & ATA_R_REQUEUE)) @@ -218,7 +219,7 @@ void ata_finish(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); /* * if in ATA_STALL_QUEUE state or request has ATA_R_DIRECT flags set @@ -247,7 +248,7 @@ ata_completed(void *context, int dummy) { struct ata_request *request = (struct ata_request *)context; - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); struct ata_device *atadev = device_get_softc(request->dev); struct ata_composite *composite; @@ -466,7 +467,7 @@ void ata_timeout(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); //request->flags |= ATA_R_DEBUG; ATA_DEBUG_RQ(request, "timeout"); @@ -479,7 +480,6 @@ */ if (ch->state == ATA_ACTIVE) { request->flags |= ATA_R_TIMEOUT; - ch->running = NULL; mtx_unlock(&ch->state_mtx); ATA_LOCKING(ch->dev, ATA_LF_UNLOCK); ata_finish(request); @@ -493,34 +493,43 @@ ata_fail_requests(device_t dev) { struct ata_channel *ch = device_get_softc(device_get_parent(dev)); - struct ata_request *request; + struct ata_request *request, *tmp; + TAILQ_HEAD(, ata_request) fail_requests; + TAILQ_INIT(&fail_requests); - /* do we have any outstanding request to care about ?*/ + /* grap all channel locks to avoid races */ + mtx_lock(&ch->queue_mtx); mtx_lock(&ch->state_mtx); + + /* do we have any running request to care about ? */ if ((request = ch->running) && (!dev || request->dev == dev)) { callout_stop(&request->callout); ch->running = NULL; - } - else - request = NULL; - mtx_unlock(&ch->state_mtx); - if (request) { + ch->state = ATA_IDLE; request->result = ENXIO; - ata_finish(request); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } /* fail all requests queued on this channel for device dev if !NULL */ - mtx_lock(&ch->queue_mtx); - while ((request = TAILQ_FIRST(&ch->ata_queue))) { + TAILQ_FOREACH_SAFE(request, &ch->ata_queue, chain, tmp) { if (!dev || request->dev == dev) { TAILQ_REMOVE(&ch->ata_queue, request, chain); - mtx_unlock(&ch->queue_mtx); request->result = ENXIO; - ata_finish(request); - mtx_lock(&ch->queue_mtx); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } } + + mtx_unlock(&ch->state_mtx); mtx_unlock(&ch->queue_mtx); + + /* finish up all requests collected above */ + TAILQ_FOREACH_SAFE(request, &fail_requests, chain, tmp) { + TAILQ_REMOVE(&fail_requests, request, chain); + ata_finish(request); + } + + /* we might have work for the other device on this channel */ + ata_start(ch->dev); } static u_int64_t ==== //depot/projects/smpng/sys/dev/fdc/fdc.c#22 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.308 2005/08/30 23:12:18 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.309 2006/02/23 19:11:16 jhb Exp $"); #include "opt_fdc.h" ==== //depot/projects/smpng/sys/dev/ic/z8530.h#3 (text+ko) ==== @@ -23,7 +23,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/dev/ic/z8530.h,v 1.3 2005/01/06 01:42:44 imp Exp $ + * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.4 2006/02/24 02:03:35 marcel Exp $ */ #ifndef _DEV_IC_Z8530_H_ @@ -34,9 +34,12 @@ * Channel B data: 1 * Channel A control: 2 * Channel A data: 3 - * - * We expect a seperate subregion for each channel. */ + +/* The following apply when using a device-scoped bus handle */ +#define CHAN_A 2 +#define CHAN_B 0 + #define REG_CTRL 0 #define REG_DATA 1 @@ -69,7 +72,7 @@ #define RR_BCL 6 /* Byte Count Low. */ #define RR_BCH 7 /* Byte Count High. */ #define RR_RB 8 /* Receive Buffer. */ -#define RR_RPC 9 /* Receive Parameters and Contro. */ +#define RR_RPC 9 /* Receive Parameters and Control. */ #define RR_MSB 10 /* Miscellaneous Status Bits. */ #define RR_MCB1 11 /* Miscellaneous Control Bits (part 1). */ #define RR_TCL 12 /* BRG Time Constant Low. */ ==== //depot/projects/smpng/sys/dev/ppc/ppc.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.48 2006/02/22 18:16:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.49 2006/02/22 21:47:04 jhb Exp $"); #include "opt_ppc.h" ==== //depot/projects/smpng/sys/dev/puc/puc_ebus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.6 2005/08/07 13:37:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.7 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" @@ -54,7 +54,7 @@ cmpt = ofw_bus_get_compat(dev); if (!strcmp(nm, "se") || (cmpt != NULL && !strcmp(cmpt, "sab82532"))) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } return (ENXIO); } ==== //depot/projects/smpng/sys/dev/puc/puc_sbus.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.8 2005/02/26 00:25:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.9 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" @@ -53,7 +53,7 @@ nm = ofw_bus_get_name(dev); if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } return (ENXIO); } ==== //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.4 2006/02/18 10:24:48 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.5 2006/02/24 09:29:32 ariff Exp $"); struct atiixp_dma_op { @@ -614,7 +614,7 @@ } #endif - return (retry > 0) ? ptr & ~align : 0; + return (retry > 0) ? ptr : 0; } static struct pcmchan_caps * ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.36 2006/01/29 01:32:37 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.37 2006/02/23 19:23:55 jhb Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -385,10 +385,8 @@ } } else if (best2 == 0) return best1; - else if (best1 == 0) + else return best2; - - return best1; } u_int32_t ==== //depot/projects/smpng/sys/dev/uart/uart_bus.h#8 (text+ko) ==== @@ -23,7 +23,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/dev/uart/uart_bus.h,v 1.9 2005/01/06 01:43:26 imp Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.11 2006/02/24 05:40:17 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ @@ -42,32 +42,12 @@ #define UART_FLUSH_RECEIVER UART_DRAIN_RECEIVER #define UART_FLUSH_TRANSMITTER UART_DRAIN_TRANSMITTER -/* - * Interrupt sources (in priority order). See also uart_core.c - * Note that the low order 16 bits are used to pass modem signals - * from the hardware interrupt handler to the software interrupt - * handler. - */ -#define UART_IPEND_OVERRUN 0x010000 -#define UART_IPEND_BREAK 0x020000 -#define UART_IPEND_RXREADY 0x040000 -#define UART_IPEND_SIGCHG 0x080000 -#define UART_IPEND_TXIDLE 0x100000 - -#define UART_IPEND_MASK 0x1f0000 -#define UART_IPEND_SIGMASK 0x00ffff - /* Received character status bits. */ #define UART_STAT_BREAK 0x0100 #define UART_STAT_FRAMERR 0x0200 #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 -#define UART_SIGMASK_DTE (SER_DTR | SER_RTS) -#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI) -#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE) -#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8) - #ifdef UART_PPS_ON_CTS #define UART_SIG_DPPS SER_DCTS #define UART_SIG_PPS SER_CTS ==== //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.9 2006/02/04 23:27:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.10 2006/02/24 05:36:44 marcel Exp $"); #include #include @@ -66,6 +66,7 @@ const char *nm, *cmpt; struct uart_softc *sc; struct uart_devinfo dummy; + int error; sc = device_get_softc(dev); sc->sc_class = NULL; @@ -101,7 +102,8 @@ } if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { sc->sc_class = &uart_sab82532_class; - return (uart_bus_probe(dev, 0, 0, 0, 1)); + error = uart_bus_probe(dev, 0, 0, 0, 1); + return ((error <= 0) ? BUS_PROBE_GENERIC : error); } return (ENXIO); ==== //depot/projects/smpng/sys/dev/uart/uart_core.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.15 2006/02/22 18:16:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.17 2006/02/24 05:40:17 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -90,7 +90,7 @@ } #endif if (sc->sc_opened) - atomic_set_32(&sc->sc_ttypend, UART_IPEND_BREAK); + atomic_set_32(&sc->sc_ttypend, SER_INT_BREAK); } /* @@ -116,7 +116,7 @@ UART_RECEIVE(sc); if (uart_rx_put(sc, UART_STAT_OVERRUN)) sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; - atomic_set_32(&sc->sc_ttypend, UART_IPEND_RXREADY); + atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); } UART_FLUSH(sc, UART_FLUSH_RECEIVER); } @@ -142,7 +142,7 @@ } #endif if (sc->sc_opened) - atomic_set_32(&sc->sc_ttypend, UART_IPEND_RXREADY); + atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); else sc->sc_rxput = sc->sc_rxget; /* Ignore received data. */ } @@ -171,9 +171,9 @@ do { old = sc->sc_ttypend; - new = old & ~UART_SIGMASK_STATE; - new |= sig & UART_IPEND_SIGMASK; - new |= UART_IPEND_SIGCHG; + new = old & ~SER_MASK_STATE; + new |= sig & SER_INT_SIGMASK; + new |= SER_INT_SIGCHG; } while (!atomic_cmpset_32(&sc->sc_ttypend, old, new)); } @@ -185,7 +185,7 @@ { if (sc->sc_txbusy) { sc->sc_txbusy = 0; - atomic_set_32(&sc->sc_ttypend, UART_IPEND_TXIDLE); + atomic_set_32(&sc->sc_ttypend, SER_INT_TXIDLE); } } @@ -202,15 +202,15 @@ ipend = UART_IPEND(sc); if (ipend == 0) break; - if (ipend & UART_IPEND_OVERRUN) + if (ipend & SER_INT_OVERRUN) uart_intr_overrun(sc); - if (ipend & UART_IPEND_BREAK) + if (ipend & SER_INT_BREAK) uart_intr_break(sc); - if (ipend & UART_IPEND_RXREADY) + if (ipend & SER_INT_RXREADY) uart_intr_rxready(sc); - if (ipend & UART_IPEND_SIGCHG) + if (ipend & SER_INT_SIGCHG) uart_intr_sigchg(sc); - if (ipend & UART_IPEND_TXIDLE) + if (ipend & SER_INT_TXIDLE) uart_intr_txidle(sc); } while (1); ==== //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.14 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.16 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -460,7 +460,7 @@ SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -556,17 +556,17 @@ lsr = uart_getreg(bas, REG_LSR); mtx_unlock_spin(&sc->sc_hwmtx); if (lsr & LSR_OE) - ipend |= UART_IPEND_OVERRUN; + ipend |= SER_INT_OVERRUN; if (lsr & LSR_BI) - ipend |= UART_IPEND_BREAK; + ipend |= SER_INT_BREAK; if (lsr & LSR_RXRDY) - ipend |= UART_IPEND_RXREADY; + ipend |= SER_INT_RXREADY; } else { mtx_unlock_spin(&sc->sc_hwmtx); if (iir & IIR_TXRDY) - ipend |= UART_IPEND_TXIDLE; + ipend |= SER_INT_TXIDLE; else - ipend |= UART_IPEND_SIGCHG; + ipend |= SER_INT_SIGCHG; } return ((sc->sc_leaving) ? 0 : ipend); } ==== //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.10 2005/01/30 22:14:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.12 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -470,7 +470,7 @@ } SIGCHG(pvr, sig, SER_DSR, SER_DDSR); mtx_unlock_spin(&sc->sc_hwmtx); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -546,15 +546,15 @@ ipend = 0; if (isr1 & SAB_ISR1_BRKT) - ipend |= UART_IPEND_BREAK; + ipend |= SER_INT_BREAK; if (isr0 & SAB_ISR0_RFO) - ipend |= UART_IPEND_OVERRUN; + ipend |= SER_INT_OVERRUN; if (isr0 & (SAB_ISR0_TCD|SAB_ISR0_RPF)) - ipend |= UART_IPEND_RXREADY; + ipend |= SER_INT_RXREADY; if ((isr0 & SAB_ISR0_CDSC) || (isr1 & SAB_ISR1_CSC)) - ipend |= UART_IPEND_SIGCHG; + ipend |= SER_INT_SIGCHG; if (isr1 & SAB_ISR1_ALLS) - ipend |= UART_IPEND_TXIDLE; + ipend |= SER_INT_TXIDLE; return (ipend); } ==== //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.12 2005/04/27 21:57:51 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.14 2006/02/24 05:40:17 marcel Exp $"); #include #include @@ -305,7 +305,7 @@ z8530->tpc = z8530_setup(bas, 9600, 8, 1, UART_PARITY_NONE); z8530->tpc &= ~(TPC_DTR|TPC_RTS); } - z8530->txidle = 1; /* Report UART_IPEND_TXIDLE. */ + z8530->txidle = 1; /* Report SER_INT_TXIDLE. */ sc->sc_rxfifosz = 3; sc->sc_txfifosz = 1; @@ -354,7 +354,7 @@ SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR); - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); } @@ -418,14 +418,14 @@ } if (ip & IP_RIA) - ipend |= UART_IPEND_RXREADY; + ipend |= SER_INT_RXREADY; if (ip & IP_TIA) { uart_setreg(bas, REG_CTRL, CR_RSTTXI); uart_barrier(bas); if (z8530->txidle) { - ipend |= UART_IPEND_TXIDLE; - z8530->txidle = 0; /* Mask UART_IPEND_TXIDLE. */ + ipend |= SER_INT_TXIDLE; + z8530->txidle = 0; /* Mask SER_INT_TXIDLE. */ } } @@ -434,18 +434,18 @@ uart_barrier(bas); bes = uart_getmreg(bas, RR_BES); if (bes & BES_BRK) - ipend |= UART_IPEND_BREAK; + ipend |= SER_INT_BREAK; sig = sc->sc_hwsig; SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR); - if (sig & UART_SIGMASK_DELTA) - ipend |= UART_IPEND_SIGCHG; + if (sig & SER_MASK_DELTA) + ipend |= SER_INT_SIGCHG; src = uart_getmreg(bas, RR_SRC); if (src & SRC_OVR) { uart_setreg(bas, REG_CTRL, CR_RSTERR); uart_barrier(bas); - ipend |= UART_IPEND_OVERRUN; + ipend |= SER_INT_OVERRUN; } } @@ -586,7 +586,7 @@ uart_setreg(bas, REG_DATA, sc->sc_txbuf[0]); uart_barrier(bas); sc->sc_txbusy = 1; - z8530->txidle = 1; /* Report UART_IPEND_TXIDLE again. */ + z8530->txidle = 1; /* Report SER_INT_TXIDLE again. */ mtx_unlock_spin(&sc->sc_hwmtx); return (0); } ==== //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.6 2005/10/25 19:48:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.7 2006/02/24 02:42:26 marcel Exp $"); #include "opt_kbd.h" @@ -274,10 +274,10 @@ return; pend = atomic_readandclear_32(&sc->sc_uart->sc_ttypend); - if (!(pend & UART_IPEND_MASK)) + if (!(pend & SER_INT_MASK)) return; - if (pend & UART_IPEND_RXREADY) { + if (pend & SER_INT_RXREADY) { if (KBD_IS_ACTIVE(&sc->sc_kbd) && KBD_IS_BUSY(&sc->sc_kbd)) { sc->sc_kbd.kb_callback.kc_func(&sc->sc_kbd, KBDIO_KEYINPUT, sc->sc_kbd.kb_callback.kc_arg); ==== //depot/projects/smpng/sys/dev/uart/uart_tty.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.25 2005/10/26 15:52:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.26 2006/02/24 02:42:26 marcel Exp $"); #include #include @@ -307,12 +307,12 @@ return; pend = atomic_readandclear_32(&sc->sc_ttypend); - if (!(pend & UART_IPEND_MASK)) + if (!(pend & SER_INT_MASK)) return; tp = sc->sc_u.u_tty.tp; - if (pend & UART_IPEND_RXREADY) { + if (pend & SER_INT_RXREADY) { while (!uart_rx_empty(sc) && !(tp->t_state & TS_TBLOCK)) { xc = uart_rx_get(sc); c = xc & 0xff; @@ -324,13 +324,13 @@ } } - if (pend & UART_IPEND_BREAK) { + if (pend & SER_INT_BREAK) { if (tp != NULL && !(tp->t_iflag & IGNBRK)) ttyld_rint(tp, 0); } - if (pend & UART_IPEND_SIGCHG) { - sig = pend & UART_IPEND_SIGMASK; + if (pend & SER_INT_SIGCHG) { + sig = pend & SER_INT_SIGMASK; if (sig & SER_DDCD) ttyld_modem(tp, sig & SER_DCD); if ((sig & SER_DCTS) && (tp->t_cflag & CCTS_OFLOW) && @@ -343,7 +343,7 @@ } } - if (pend & UART_IPEND_TXIDLE) { + if (pend & SER_INT_TXIDLE) { tp->t_state &= ~TS_BUSY; ttyld_start(tp); } ==== //depot/projects/smpng/sys/i386/include/mptable.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/mptable.h,v 1.222 2005/01/06 22:18:15 imp Exp $ + * $FreeBSD: src/sys/i386/include/mptable.h,v 1.223 2006/02/22 21:38:33 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/smpng/sys/kern/kern_condvar.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.54 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.55 2006/02/23 00:13:58 davidxu Exp $"); #include "opt_ktrace.h" @@ -192,18 +192,6 @@ sleepq_lock(cvp); - /* - * Don't bother sleeping if we are exiting and not the exiting - * thread or if our thread is marked as interrupted. - */ - mtx_lock_spin(&sched_lock); - rval = thread_sleep_check(td); - mtx_unlock_spin(&sched_lock); - if (rval != 0) { - sleepq_release(cvp); - return (rval); - } - cvp->cv_waiters++; DROP_GIANT(); mtx_unlock(mp); @@ -315,18 +303,6 @@ sleepq_lock(cvp); - /* - * Don't bother sleeping if we are exiting and not the exiting - * thread or if our thread is marked as interrupted. - */ - mtx_lock_spin(&sched_lock); - rval = thread_sleep_check(td); - mtx_unlock_spin(&sched_lock); - if (rval != 0) { - sleepq_release(cvp); - return (rval); - } - cvp->cv_waiters++; DROP_GIANT(); mtx_unlock(mp); ==== //depot/projects/smpng/sys/kern/kern_sig.c#118 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.323 2006/02/15 23:52:00 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.325 2006/02/23 09:24:19 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1189,35 +1189,40 @@ } } -again: +restart: for (i = 1; i <= _SIG_MAXSIG; ++i) { if (!SIGISMEMBER(waitset, i)) continue; - if (SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { - SIGFILLSET(td->td_sigmask); - SIG_CANTMASK(td->td_sigmask); - SIGDELSET(td->td_sigmask, i); - mtx_lock(&ps->ps_mtx); - sig = cursig(td); - i = 0; - mtx_unlock(&ps->ps_mtx); - } else if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { - if (p->p_flag & P_SA) { - p->p_flag |= P_SIGEVENT; - wakeup(&p->p_siglist); - } - sigqueue_move(&p->p_sigqueue, &td->td_sigqueue, i); - SIGFILLSET(td->td_sigmask); - SIG_CANTMASK(td->td_sigmask); - SIGDELSET(td->td_sigmask, i); - mtx_lock(&ps->ps_mtx); - sig = cursig(td); - i = 0; - mtx_unlock(&ps->ps_mtx); + if (!SIGISMEMBER(td->td_sigqueue.sq_signals, i)) { + if (SIGISMEMBER(p->p_sigqueue.sq_signals, i)) { + if (p->p_flag & P_SA) { + p->p_flag |= P_SIGEVENT; + wakeup(&p->p_siglist); + } + sigqueue_move(&p->p_sigqueue, + &td->td_sigqueue, i); + } else + continue; } + + SIGFILLSET(td->td_sigmask); + SIG_CANTMASK(td->td_sigmask); + SIGDELSET(td->td_sigmask, i); + mtx_lock(&ps->ps_mtx); + sig = cursig(td); + mtx_unlock(&ps->ps_mtx); if (sig) goto out; + else { + /* + * Because cursig() may have stopped current thread, + * after it is resumed, things may have already been + * changed, it should rescan any pending signals. + */ + goto restart; + } } + if (error) goto out; @@ -1255,30 +1260,37 @@ error = 0; } } - goto again; + goto restart; out: + td->td_sigmask = savedmask; + signotify(td); if (sig) { - sig_t action; - ksiginfo_init(ksi); sigqueue_get(&td->td_sigqueue, sig, ksi); ksi->ksi_signo = sig; if (ksi->ksi_code == SI_TIMER) itimer_accept(p, ksi->ksi_timerid, ksi); error = 0; - mtx_lock(&ps->ps_mtx); - action = ps->ps_sigact[_SIG_IDX(sig)]; - mtx_unlock(&ps->ps_mtx); + #ifdef KTRACE - if (KTRPOINT(td, KTR_PSIG)) + if (KTRPOINT(td, KTR_PSIG)) { + sig_t action; + + mtx_lock(&ps->ps_mtx); + action = ps->ps_sigact[_SIG_IDX(sig)]; + mtx_unlock(&ps->ps_mtx); ktrpsig(sig, action, &td->td_sigmask, 0); + } #endif _STOPEVENT(p, S_SIG, sig); + if (sig == SIGKILL) { + p->p_code = ksi->ksi_code; + p->p_sig = sig; + sigexit(td, sig); + } } - td->td_sigmask = savedmask; - signotify(td); PROC_UNLOCK(p); return (error); } @@ -2673,13 +2685,12 @@ void thread_stopped(struct proc *p) { - struct proc *p1 = curthread->td_proc; int n; PROC_LOCK_ASSERT(p, MA_OWNED); mtx_assert(&sched_lock, MA_OWNED); n = p->p_suspcount; - if (p == p1) + if (p == curproc) n++; if ((p->p_flag & P_STOPPED_SIG) && (n == p->p_numthreads)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 25 00:09: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 5A35C16A423; Sat, 25 Feb 2006 00:09:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E82D716A420 for ; Sat, 25 Feb 2006 00:09:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94B6943D45 for ; Sat, 25 Feb 2006 00:09:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P09bPr041460 for ; Sat, 25 Feb 2006 00:09:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P09b8f041457 for perforce@freebsd.org; Sat, 25 Feb 2006 00:09:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 25 Feb 2006 00:09:37 GMT Message-Id: <200602250009.k1P09b8f041457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92364 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: Sat, 25 Feb 2006 00:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=92364 Change 92364 by rwatson@rwatson_peppercorn on 2006/02/25 00:08:51 Use -Lpath rather than -L path since this is happier on Darwin. Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= audit MAN= audit.8 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= auditd SRCS= audit_warn.c auditd.c MAN= auditd.8 ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= auditreduce MAN= auditreduce.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= praudit MAN= praudit.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/tools/Makefile#4 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#4 $ # -CFLAGS+= -I- -I .. -I ../libbsm -L ../libbsm -I. +CFLAGS+= -I- -I .. -I ../libbsm -L../libbsm -I. PROG= audump NO_MAN= DPADD= /usr/lib/libbsm.a From owner-p4-projects@FreeBSD.ORG Sat Feb 25 00:12: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 9354016A423; Sat, 25 Feb 2006 00:12:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 566E716A420 for ; Sat, 25 Feb 2006 00:12:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20C5543D46 for ; Sat, 25 Feb 2006 00:12:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P0Cghx041726 for ; Sat, 25 Feb 2006 00:12:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P0CgNJ041723 for perforce@freebsd.org; Sat, 25 Feb 2006 00:12:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 25 Feb 2006 00:12:42 GMT Message-Id: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92365 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: Sat, 25 Feb 2006 00:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92365 Change 92365 by rwatson@rwatson_peppercorn on 2006/02/25 00:12:28 On systems without LOG_SECURITY defined, use LOG_AUTH. Reported by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { From owner-p4-projects@FreeBSD.ORG Sat Feb 25 03:24:56 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 A40FB16A423; Sat, 25 Feb 2006 03:24:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4213A16A422 for ; Sat, 25 Feb 2006 03:24:55 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE79F43D46 for ; Sat, 25 Feb 2006 03:24:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P3OsTc056037 for ; Sat, 25 Feb 2006 03:24:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P3OsKe056034 for perforce@freebsd.org; Sat, 25 Feb 2006 03:24:54 GMT (envelope-from wsalamon@computer.org) Date: Sat, 25 Feb 2006 03:24:54 GMT Message-Id: <200602250324.k1P3OsKe056034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 92369 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: Sat, 25 Feb 2006 03:24:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92369 Change 92369 by wsalamon@gretsch on 2006/02/25 03:23:59 Cleanups done in preparation for merge into FreeBSD CVS: - Remove unecessary linefeeds - Audit the vnode only when the vnode lock and reference are held - Move some vnode auditing into the actual system call, out of the kern_xxx function in order to avoid duplicated auditing of the vnode: once during namei lookup and once in the kern_xxx function Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#28 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#28 (text+ko) ==== @@ -194,8 +194,7 @@ if (jailed(td->td_ucred) && !prison_quotas) return (EPERM); mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) { mtx_unlock(&Giant); return (error); @@ -329,16 +328,16 @@ if (error) return (error); vp = fp->f_vnode; +#ifdef AUDIT + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, vp, ARG_VNODE1); + VOP_UNLOCK(vp, 0, td); +#endif mp = vp->v_mount; fdrop(fp, td); if (vp->v_iflag & VI_DOOMED) return (EBADF); mtx_lock(&Giant); -#ifdef AUDIT - vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); - VOP_UNLOCK(fp->f_vnode, 0, td); -#endif #ifdef MAC error = mac_check_mount_stat(td->td_ucred, mp); if (error) { @@ -2375,7 +2374,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); VATTR_NULL(&vattr); vattr.va_flags = flags; #ifdef MAC @@ -2476,6 +2474,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfflags(td, fp->f_vnode, uap->flags); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2611,7 +2614,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfmode(td, fp->f_vnode, uap->mode); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2636,7 +2643,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); VATTR_NULL(&vattr); vattr.va_uid = uid; vattr.va_gid = gid; @@ -2765,6 +2771,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfown(td, fp->f_vnode, uap->uid, uap->gid); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2825,7 +2836,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); setbirthtime = 0; if (numtimes < 3 && VOP_GETATTR(vp, &vattr, td->td_ucred, td) == 0 && timespeccmp(&ts[1], &vattr.va_birthtime, < )) @@ -2883,8 +2893,7 @@ if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2928,8 +2937,7 @@ if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2976,6 +2984,11 @@ if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -3017,8 +3030,7 @@ if (length < 0) return(EINVAL); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3090,7 +3102,7 @@ goto drop; VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + AUDIT_ARG(vnode, vp, ARG_VNODE1); if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC @@ -3195,10 +3207,10 @@ return (error); vp = fp->f_vnode; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - AUDIT_ARG(vnode, vp, ARG_VNODE1); if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, vp, ARG_VNODE1); if (vp->v_object != NULL) { VM_OBJECT_LOCK(vp->v_object); vm_object_page_clean(vp->v_object, 0, 0, 0); @@ -3712,7 +3724,6 @@ AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); - if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); return (EBADF); @@ -3734,7 +3745,7 @@ auio.uio_resid = uap->count; /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + AUDIT_ARG(vnode, vp, ARG_VNODE1); loff = auio.uio_offset = fp->f_offset; #ifdef MAC error = mac_check_vnode_readdir(td->td_ucred, vp); From owner-p4-projects@FreeBSD.ORG Sat Feb 25 05:46: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 67C1816A424; Sat, 25 Feb 2006 05:46:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4956016A420 for ; Sat, 25 Feb 2006 05:46:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7AC043D73 for ; Sat, 25 Feb 2006 05:46:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P5kQ99069555 for ; Sat, 25 Feb 2006 05:46:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P5cqFv069267 for perforce@freebsd.org; Sat, 25 Feb 2006 05:38:52 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Feb 2006 05:38:52 GMT Message-Id: <200602250538.k1P5cqFv069267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92371 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: Sat, 25 Feb 2006 05:46:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92371 Change 92371 by kmacy@kmacy_storage:sun4v_work on 2006/02/25 05:32:44 IFC Affected files ... .. //depot/projects/kmacy_sun4v/doc/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/README#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/hubs/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/converse.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pam/su.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/bibliography/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/mk/doc.local.mk#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/README#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/admin.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/applications.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/includes.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/install.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/misc.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/network.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/serial.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/FAQ/x.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/authors.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/es_ES.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/converse.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pam/su.c#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/cat.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/chkey.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/echo.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/head.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man1/intro.1#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/agp.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/amd.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/ncr.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sd.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/sn.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/spic.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/st.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/intro.5#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man5/publickey.5#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man6/intro.6#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/ascii.7#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/man/man7/intro.7#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/books.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/euro/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/flyer/flyer.tex#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/articles.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/books.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/catalog#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/translators.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributing/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/contributors/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/fonts/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/multi-os/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/faq/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/kmacy_sun4v/doc/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 25 06:11:56 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 8265B16A422; Sat, 25 Feb 2006 06:11:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 232E216A423 for ; Sat, 25 Feb 2006 06:11:55 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id 3CC7043D46 for ; Sat, 25 Feb 2006 06:11:54 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 4907 invoked by uid 0); 25 Feb 2006 06:18:53 -0000 Received: from unknown (HELO ?192.168.1.100?) (unknown) by unknown with SMTP; 25 Feb 2006 06:18:53 -0000 Message-ID: <43FFF528.7070100@FreeBSD.org> Date: Sat, 25 Feb 2006 00:11:52 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Watson References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> In-Reply-To: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 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: Sat, 25 Feb 2006 06:11:56 -0000 Robert Watson wrote: >http://perforce.freebsd.org/chv.cgi?CH=92365 > >Change 92365 by rwatson@rwatson_peppercorn on 2006/02/25 00:12:28 > > On systems without LOG_SECURITY defined, use LOG_AUTH. > > Reported by: Martin Fong > >Affected files ... > >.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 edit > >Differences ... > >==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 (text+ko) ==== > >@@ -30,7 +30,7 @@ > * > * @APPLE_BSD_LICENSE_HEADER_END@ > * >- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ >+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ > */ > > #include >@@ -795,7 +795,11 @@ > } > } > >+#ifdef LOG_SECURITY > openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >+#else >+ openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >+#endif > syslog(LOG_INFO, "starting...\n"); > > if (debug == 0 && daemon(0, 0) == -1) { > > > > In userspace, we are using LOG_AUTH | LOG_ERR to report audit failures, at least for login(1) and su(1). Might be a good idea to be consistent, anyway. -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-p4-projects@FreeBSD.ORG Sat Feb 25 06:14: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 AD9B116A423; Sat, 25 Feb 2006 06:14:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 862DB16A420 for ; Sat, 25 Feb 2006 06:14:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FE7E43D45 for ; Sat, 25 Feb 2006 06:14:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P6E1Bn070557 for ; Sat, 25 Feb 2006 06:14:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P6E1Xs070552 for perforce@freebsd.org; Sat, 25 Feb 2006 06:14:01 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Feb 2006 06:14:01 GMT Message-Id: <200602250614.k1P6E1Xs070552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92373 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: Sat, 25 Feb 2006 06:14:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92373 Change 92373 by kmacy@kmacy_storage:sun4v_work on 2006/02/25 06:13:42 IFC #2 Affected files ... .. //depot/projects/kmacy_sun4v/src/sbin/mount/mount.8#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_output.c#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/sbin/mount/mount.8#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.74 2006/01/10 15:56:46 pav Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.75 2006/02/25 00:47:53 rodrigc Exp $ .\" .Dd November 26, 2004 .Dt MOUNT 8 @@ -52,7 +52,7 @@ The .Nm utility calls the -.Xr mount 2 +.Xr nmount 2 system call to prepare and graft a .Ar "special device" or the remote node (rhost:path) on to the file system tree at the point @@ -377,13 +377,39 @@ and .Tn NULLFS . .Pp -If the type is not one of the internally known types, +The default behavior of +.Nm +is to pass the +.Fl t +option directly to the +.Xr nmount 2 +system call in the +.Li fstype +option. +.Pp +However, for the following file system types: +.Ar cd9660 , +.Ar mfs , +.Ar msdosfs , +.Ar nfs , +.Ar nfs4 , +.Ar ntfs , +.Ar nwfs , +.Ar nullfs , +.Ar portalfs , +.Ar smbfs , +.Ar udf , +.Ar umapfs , +and +.Ar unionfs , .Nm -will attempt to execute a program in +will not call +.Xr nmount 2 +directly and will instead attempt to execute a program in .Pa /sbin/mount_ Ns Sy XXX where .Sy XXX -is replaced by the type name. +is replaced by the file system type name. For example, nfs file systems are mounted by the program .Pa /sbin/mount_nfs . .Pp @@ -449,16 +475,13 @@ .Sh SEE ALSO .Xr getfacl 1 , .Xr setfacl 1 , -.Xr mount 2 , +.Xr nmount 2 , .Xr acl 3 , .Xr mac 4 , .Xr fstab 5 , .Xr kldload 8 , .Xr mount_cd9660 8 , -.Xr mount_devfs 8 , .Xr mount_ext2fs 8 , -.Xr mount_fdescfs 8 , -.Xr mount_linprocfs 8 , .Xr mount_msdosfs 8 , .Xr mount_nfs 8 , .Xr mount_ntfs 8 , @@ -466,7 +489,6 @@ .Xr mount_nwfs 8 , .Xr mount_portalfs 8 , .Xr mount_procfs 8 , -.Xr mount_reiserfs 8 , .Xr mount_smbfs 8 , .Xr mount_std 8 , .Xr mount_udf 8 , ==== //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/Makefile#3 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/boot/ofw/libofw/openfirm.c#3 (text+ko) ==== @@ -747,6 +747,9 @@ args.ihandle = mmu; args.align = align; args.size = size; + args.ihandle = mmu; + args.align = align; + args.size = size; args.virt = virt; if (openfirmware(&args) == -1) ==== //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/main.c#4 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include - #include "bootstrap.h" #include "libofw.h" #include "dev_net.h" @@ -99,6 +98,15 @@ #define SUN4V_TLB_SLOT_MAX (1 << 10) +extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; + +struct tlb_entry *dtlb_store; +struct tlb_entry *itlb_store; + +int dtlb_slot; +int itlb_slot; +int dtlb_slot_max; +int itlb_slot_max; vm_offset_t curkva = 0; vm_offset_t heapva; ==== //depot/projects/kmacy_sun4v/src/sys/i386/cpufreq/est.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.9 2005/07/31 06:42:27 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.10 2006/02/25 04:55:38 cperciva Exp $"); #include #include @@ -464,6 +464,33 @@ FREQ_INFO( 600, 988, INTEL_BUS_CLK), FREQ_INFO( 0, 0, 1), }; +static freq_info PM_778_90[] = { + /* 90 nm 1.60GHz Low Voltage Pentium M */ + FREQ_INFO(1600, 1116, INTEL_BUS_CLK), + FREQ_INFO(1500, 1116, INTEL_BUS_CLK), + FREQ_INFO(1400, 1100, INTEL_BUS_CLK), + FREQ_INFO(1300, 1084, INTEL_BUS_CLK), + FREQ_INFO(1200, 1068, INTEL_BUS_CLK), + FREQ_INFO(1100, 1052, INTEL_BUS_CLK), + FREQ_INFO(1000, 1052, INTEL_BUS_CLK), + FREQ_INFO( 900, 1036, INTEL_BUS_CLK), + FREQ_INFO( 800, 1020, INTEL_BUS_CLK), + FREQ_INFO( 600, 988, INTEL_BUS_CLK), + FREQ_INFO( 0, 0, 1), +}; +static freq_info PM_758_90[] = { + /* 90 nm 1.50GHz Low Voltage Pentium M */ + FREQ_INFO(1500, 1116, INTEL_BUS_CLK), + FREQ_INFO(1400, 1116, INTEL_BUS_CLK), + FREQ_INFO(1300, 1100, INTEL_BUS_CLK), + FREQ_INFO(1200, 1084, INTEL_BUS_CLK), + FREQ_INFO(1100, 1068, INTEL_BUS_CLK), + FREQ_INFO(1000, 1052, INTEL_BUS_CLK), + FREQ_INFO( 900, 1036, INTEL_BUS_CLK), + FREQ_INFO( 800, 1020, INTEL_BUS_CLK), + FREQ_INFO( 600, 988, INTEL_BUS_CLK), + FREQ_INFO( 0, 0, 1), +}; static freq_info PM_738_90[] = { /* 90 nm 1.40GHz Low Voltage Pentium M */ FREQ_INFO(1400, 1116, INTEL_BUS_CLK), @@ -476,6 +503,169 @@ FREQ_INFO( 600, 988, INTEL_BUS_CLK), FREQ_INFO( 0, 0, 1), }; +static freq_info PM_773G_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #G */ + FREQ_INFO(1300, 956, INTEL_BUS_CLK), + FREQ_INFO(1200, 940, INTEL_BUS_CLK), + FREQ_INFO(1100, 924, INTEL_BUS_CLK), + FREQ_INFO(1000, 908, INTEL_BUS_CLK), + FREQ_INFO( 900, 876, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_773H_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #H */ + FREQ_INFO(1300, 940, INTEL_BUS_CLK), + FREQ_INFO(1200, 924, INTEL_BUS_CLK), + FREQ_INFO(1100, 908, INTEL_BUS_CLK), + FREQ_INFO(1000, 892, INTEL_BUS_CLK), + FREQ_INFO( 900, 876, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_773I_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #I */ + FREQ_INFO(1300, 924, INTEL_BUS_CLK), + FREQ_INFO(1200, 908, INTEL_BUS_CLK), + FREQ_INFO(1100, 892, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_773J_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #J */ + FREQ_INFO(1300, 908, INTEL_BUS_CLK), + FREQ_INFO(1200, 908, INTEL_BUS_CLK), + FREQ_INFO(1100, 892, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_773K_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #K */ + FREQ_INFO(1300, 892, INTEL_BUS_CLK), + FREQ_INFO(1200, 892, INTEL_BUS_CLK), + FREQ_INFO(1100, 876, INTEL_BUS_CLK), + FREQ_INFO(1000, 860, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_773L_90[] = { + /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #L */ + FREQ_INFO(1300, 876, INTEL_BUS_CLK), + FREQ_INFO(1200, 876, INTEL_BUS_CLK), + FREQ_INFO(1100, 860, INTEL_BUS_CLK), + FREQ_INFO(1000, 860, INTEL_BUS_CLK), + FREQ_INFO( 900, 844, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753G_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #G */ + FREQ_INFO(1200, 956, INTEL_BUS_CLK), + FREQ_INFO(1100, 940, INTEL_BUS_CLK), + FREQ_INFO(1000, 908, INTEL_BUS_CLK), + FREQ_INFO( 900, 892, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753H_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #H */ + FREQ_INFO(1200, 940, INTEL_BUS_CLK), + FREQ_INFO(1100, 924, INTEL_BUS_CLK), + FREQ_INFO(1000, 908, INTEL_BUS_CLK), + FREQ_INFO( 900, 876, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753I_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #I */ + FREQ_INFO(1200, 924, INTEL_BUS_CLK), + FREQ_INFO(1100, 908, INTEL_BUS_CLK), + FREQ_INFO(1000, 892, INTEL_BUS_CLK), + FREQ_INFO( 900, 876, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753J_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #J */ + FREQ_INFO(1200, 908, INTEL_BUS_CLK), + FREQ_INFO(1100, 892, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753K_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #K */ + FREQ_INFO(1200, 892, INTEL_BUS_CLK), + FREQ_INFO(1100, 892, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_753L_90[] = { + /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #L */ + FREQ_INFO(1200, 876, INTEL_BUS_CLK), + FREQ_INFO(1100, 876, INTEL_BUS_CLK), + FREQ_INFO(1000, 860, INTEL_BUS_CLK), + FREQ_INFO( 900, 844, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; + +static freq_info PM_733JG_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #G */ + FREQ_INFO(1100, 956, INTEL_BUS_CLK), + FREQ_INFO(1000, 940, INTEL_BUS_CLK), + FREQ_INFO( 900, 908, INTEL_BUS_CLK), + FREQ_INFO( 800, 876, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_733JH_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #H */ + FREQ_INFO(1100, 940, INTEL_BUS_CLK), + FREQ_INFO(1000, 924, INTEL_BUS_CLK), + FREQ_INFO( 900, 892, INTEL_BUS_CLK), + FREQ_INFO( 800, 876, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_733JI_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #I */ + FREQ_INFO(1100, 924, INTEL_BUS_CLK), + FREQ_INFO(1000, 908, INTEL_BUS_CLK), + FREQ_INFO( 900, 892, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_733JJ_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #J */ + FREQ_INFO(1100, 908, INTEL_BUS_CLK), + FREQ_INFO(1000, 892, INTEL_BUS_CLK), + FREQ_INFO( 900, 876, INTEL_BUS_CLK), + FREQ_INFO( 800, 860, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_733JK_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #K */ + FREQ_INFO(1100, 892, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; +static freq_info PM_733JL_90[] = { + /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #L */ + FREQ_INFO(1100, 876, INTEL_BUS_CLK), + FREQ_INFO(1000, 876, INTEL_BUS_CLK), + FREQ_INFO( 900, 860, INTEL_BUS_CLK), + FREQ_INFO( 800, 844, INTEL_BUS_CLK), + FREQ_INFO( 600, 812, INTEL_BUS_CLK), +}; static freq_info PM_733_90[] = { /* 90 nm 1.10GHz Ultra Low Voltage Pentium M */ FREQ_INFO(1100, 940, INTEL_BUS_CLK), @@ -529,7 +719,27 @@ INTEL(PM_715B_90, 1500, 1324, 600, 988, INTEL_BUS_CLK), INTEL(PM_715C_90, 1500, 1308, 600, 988, INTEL_BUS_CLK), INTEL(PM_715D_90, 1500, 1276, 600, 988, INTEL_BUS_CLK), + INTEL(PM_778_90, 1600, 1116, 600, 988, INTEL_BUS_CLK), + INTEL(PM_758_90, 1500, 1116, 600, 988, INTEL_BUS_CLK), INTEL(PM_738_90, 1400, 1116, 600, 988, INTEL_BUS_CLK), + INTEL(PM_773G_90, 1300, 956, 600, 812, INTEL_BUS_CLK), + INTEL(PM_773H_90, 1300, 940, 600, 812, INTEL_BUS_CLK), + INTEL(PM_773I_90, 1300, 924, 600, 812, INTEL_BUS_CLK), + INTEL(PM_773J_90, 1300, 908, 600, 812, INTEL_BUS_CLK), + INTEL(PM_773K_90, 1300, 892, 600, 812, INTEL_BUS_CLK), + INTEL(PM_773L_90, 1300, 876, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753G_90, 1200, 956, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753H_90, 1200, 940, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753I_90, 1200, 924, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753J_90, 1200, 908, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753K_90, 1200, 892, 600, 812, INTEL_BUS_CLK), + INTEL(PM_753L_90, 1200, 876, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JG_90, 1100, 956, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JH_90, 1100, 940, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JI_90, 1100, 924, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JJ_90, 1100, 908, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JK_90, 1100, 892, 600, 812, INTEL_BUS_CLK), + INTEL(PM_733JL_90, 1100, 876, 600, 812, INTEL_BUS_CLK), INTEL(PM_733_90, 1100, 940, 600, 812, INTEL_BUS_CLK), INTEL(PM_723_90, 1000, 940, 600, 812, INTEL_BUS_CLK), { NULL, 0, 0, NULL }, ==== //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_output.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.38 2006/02/08 17:30:31 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.39 2006/02/25 05:36:43 sam Exp $"); #include "opt_inet.h" @@ -1041,6 +1041,32 @@ } /* + * Calculate capability information for mgt frames. + */ +static u_int16_t +getcapinfo(struct ieee80211com *ic, struct ieee80211_channel *chan) +{ + u_int16_t capinfo; + + KASSERT(ic->ic_opmode != IEEE80211_M_STA, ("station mode")); + + if (ic->ic_opmode == IEEE80211_M_HOSTAP) + capinfo = IEEE80211_CAPINFO_ESS; + else if (ic->ic_opmode == IEEE80211_M_IBSS) + capinfo = IEEE80211_CAPINFO_IBSS; + else + capinfo = 0; + if (ic->ic_flags & IEEE80211_F_PRIVACY) + capinfo |= IEEE80211_CAPINFO_PRIVACY; + if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && + IEEE80211_IS_CHAN_2GHZ(chan)) + capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; + if (ic->ic_flags & IEEE80211_F_SHSLOT) + capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; + return capinfo; +} + +/* * Send a management frame. The node is for the destination (or ic_bss * when in station mode). Nodes other than ic_bss have their reference * count bumped to reflect our use for an indeterminant time. @@ -1108,17 +1134,7 @@ frm += 8; *(u_int16_t *)frm = htole16(ic->ic_bss->ni_intval); frm += 2; - if (ic->ic_opmode == IEEE80211_M_IBSS) - capinfo = IEEE80211_CAPINFO_IBSS; - else - capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_PRIVACY) - capinfo |= IEEE80211_CAPINFO_PRIVACY; - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) - capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) - capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; + capinfo = getcapinfo(ic, ic->ic_curchan); *(u_int16_t *)frm = htole16(capinfo); frm += 2; @@ -1259,11 +1275,9 @@ if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - capinfo = 0; - if (ic->ic_opmode == IEEE80211_M_IBSS) - capinfo |= IEEE80211_CAPINFO_IBSS; - else /* IEEE80211_M_STA */ - capinfo |= IEEE80211_CAPINFO_ESS; + KASSERT(ic->ic_opmode == IEEE80211_M_STA, + ("wrong mode %u", ic->ic_opmode)); + capinfo = IEEE80211_CAPINFO_ESS; if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; /* @@ -1323,14 +1337,7 @@ if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_PRIVACY) - capinfo |= IEEE80211_CAPINFO_PRIVACY; - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) - capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) - capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; + capinfo = getcapinfo(ic, ic->ic_curchan); *(u_int16_t *)frm = htole16(capinfo); frm += 2; @@ -1439,17 +1446,7 @@ frm += 8; *(u_int16_t *)frm = htole16(ni->ni_intval); frm += 2; - if (ic->ic_opmode == IEEE80211_M_IBSS) - capinfo = IEEE80211_CAPINFO_IBSS; - else - capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_PRIVACY) - capinfo |= IEEE80211_CAPINFO_PRIVACY; - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) - capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) - capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; + capinfo = getcapinfo(ic, ni->ni_chan); bo->bo_caps = (u_int16_t *)frm; *(u_int16_t *)frm = htole16(capinfo); frm += 2; @@ -1472,7 +1469,7 @@ *frm++ = 2; *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ bo->bo_tim_len = 0; - } else { + } else if (ic->ic_opmode == IEEE80211_M_HOSTAP) { struct ieee80211_tim_ie *tie = (struct ieee80211_tim_ie *) frm; tie->tim_ie = IEEE80211_ELEMID_TIM; @@ -1527,17 +1524,7 @@ IEEE80211_BEACON_LOCK(ic); /* XXX faster to recalculate entirely or just changes? */ - if (ic->ic_opmode == IEEE80211_M_IBSS) - capinfo = IEEE80211_CAPINFO_IBSS; - else - capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_PRIVACY) - capinfo |= IEEE80211_CAPINFO_PRIVACY; - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) - capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) - capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; + capinfo = getcapinfo(ic, ni->ni_chan); *bo->bo_caps = htole16(capinfo); if (ic->ic_flags & IEEE80211_F_WME) { From owner-p4-projects@FreeBSD.ORG Sat Feb 25 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 E6F0916A423; Sat, 25 Feb 2006 06:22:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C194D16A420 for ; Sat, 25 Feb 2006 06:22:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7409A43D48 for ; Sat, 25 Feb 2006 06:22:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1P6MBbu070919 for ; Sat, 25 Feb 2006 06:22:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P6MBue070916 for perforce@freebsd.org; Sat, 25 Feb 2006 06:22:11 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Feb 2006 06:22:11 GMT Message-Id: <200602250622.k1P6MBue070916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92374 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: Sat, 25 Feb 2006 06:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92374 Change 92374 by kmacy@kmacy_storage:sun4v_work on 2006/02/25 06:22:05 IFC3 Affected files ... .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/java-tomcat/Makefile#2 delete .. //depot/projects/kmacy_sun4v/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91st.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/std.at91rm92#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 25 17:19: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 615F616A424; Sat, 25 Feb 2006 17:19:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FD3616A420 for ; Sat, 25 Feb 2006 17:19:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C970D43D46 for ; Sat, 25 Feb 2006 17:19:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1PHJXW2016990 for ; Sat, 25 Feb 2006 17:19:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1PHJX7A016980 for perforce@freebsd.org; Sat, 25 Feb 2006 17:19:33 GMT (envelope-from imp@freebsd.org) Date: Sat, 25 Feb 2006 17:19:33 GMT Message-Id: <200602251719.k1PHJX7A016980@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 92381 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: Sat, 25 Feb 2006 17:19:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92381 Change 92381 by imp@imp_harmony on 2006/02/25 17:18:54 IFC @92379 Affected files ... .. //depot/projects/arm/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/arm/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_ebus.c#3 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#6 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/arm/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/arm/src/sys/sys/serial.h#2 integrate Differences ... ==== //depot/projects/arm/src/sys/conf/kmod.mk#8 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.205 2006/02/20 01:08:33 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.206 2006/02/24 01:49:36 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -320,7 +320,7 @@ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ - dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \ + dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/usb/usb_if.m isa/isa_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ ==== //depot/projects/arm/src/sys/dev/amr/amr_linux.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.1 2006/01/24 21:13:49 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.2 2006/02/23 18:05:38 jhb Exp $"); #include #include @@ -170,13 +170,15 @@ devclass_t devclass; struct amr_softc *sc; struct amr_linux_ioctl ali; - int adapter; + int adapter, error; devclass = devclass_find("amr"); if (devclass == NULL) return (ENOENT); - copyin((caddr_t)args->arg, &ali, sizeof(ali)); + error = copyin((caddr_t)args->arg, &ali, sizeof(ali)); + if (error) + return (error); if (ali.ui.fcs.opcode == 0x82) adapter = 0; else ==== //depot/projects/arm/src/sys/dev/ata/ata-all.h#9 (text+ko) ==== @@ -23,7 +23,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/dev/ata/ata-all.h,v 1.113 2006/02/09 20:54:42 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.114 2006/02/23 20:15:22 sos Exp $ */ /* ATA register defines */ @@ -338,6 +338,7 @@ /* structure used to queue an ATA/ATAPI request */ struct ata_request { device_t dev; /* device handle */ + device_t parent; /* channel handle */ union { struct { u_int8_t command; /* command reg */ ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.159 2006/02/16 17:09:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.160 2006/02/23 18:52:15 sos Exp $"); #include "opt_ata.h" #include @@ -4075,7 +4075,6 @@ /* setup the usual register normal pci style */ if (ata_pci_allocate(dev)) return ENXIO; - ata_pci_allocate(dev); if (ctlr->chip->cfg2 & SIIINTR) ch->hw.status = ata_cmd_status; ==== //depot/projects/arm/src/sys/dev/ata/ata-queue.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.55 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.56 2006/02/23 20:15:22 sos Exp $"); #include "opt_ata.h" #include @@ -55,6 +55,7 @@ /* mark request as virgin (this might be a ATA_R_REQUEUE) */ request->result = request->status = request->error = 0; + request->parent = device_get_parent(request->dev); callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED); if (!request->callback && !(request->flags & ATA_R_REQUEUE)) @@ -218,7 +219,7 @@ void ata_finish(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); /* * if in ATA_STALL_QUEUE state or request has ATA_R_DIRECT flags set @@ -247,7 +248,7 @@ ata_completed(void *context, int dummy) { struct ata_request *request = (struct ata_request *)context; - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); struct ata_device *atadev = device_get_softc(request->dev); struct ata_composite *composite; @@ -466,7 +467,7 @@ void ata_timeout(struct ata_request *request) { - struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_channel *ch = device_get_softc(request->parent); //request->flags |= ATA_R_DEBUG; ATA_DEBUG_RQ(request, "timeout"); @@ -479,7 +480,6 @@ */ if (ch->state == ATA_ACTIVE) { request->flags |= ATA_R_TIMEOUT; - ch->running = NULL; mtx_unlock(&ch->state_mtx); ATA_LOCKING(ch->dev, ATA_LF_UNLOCK); ata_finish(request); @@ -493,34 +493,43 @@ ata_fail_requests(device_t dev) { struct ata_channel *ch = device_get_softc(device_get_parent(dev)); - struct ata_request *request; + struct ata_request *request, *tmp; + TAILQ_HEAD(, ata_request) fail_requests; + TAILQ_INIT(&fail_requests); - /* do we have any outstanding request to care about ?*/ + /* grap all channel locks to avoid races */ + mtx_lock(&ch->queue_mtx); mtx_lock(&ch->state_mtx); + + /* do we have any running request to care about ? */ if ((request = ch->running) && (!dev || request->dev == dev)) { callout_stop(&request->callout); ch->running = NULL; - } - else - request = NULL; - mtx_unlock(&ch->state_mtx); - if (request) { + ch->state = ATA_IDLE; request->result = ENXIO; - ata_finish(request); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } /* fail all requests queued on this channel for device dev if !NULL */ - mtx_lock(&ch->queue_mtx); - while ((request = TAILQ_FIRST(&ch->ata_queue))) { + TAILQ_FOREACH_SAFE(request, &ch->ata_queue, chain, tmp) { if (!dev || request->dev == dev) { TAILQ_REMOVE(&ch->ata_queue, request, chain); - mtx_unlock(&ch->queue_mtx); request->result = ENXIO; - ata_finish(request); - mtx_lock(&ch->queue_mtx); + TAILQ_INSERT_TAIL(&fail_requests, request, chain); } } + + mtx_unlock(&ch->state_mtx); mtx_unlock(&ch->queue_mtx); + + /* finish up all requests collected above */ + TAILQ_FOREACH_SAFE(request, &fail_requests, chain, tmp) { + TAILQ_REMOVE(&fail_requests, request, chain); + ata_finish(request); + } + + /* we might have work for the other device on this channel */ + ata_start(ch->dev); } static u_int64_t ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.135 2006/02/15 18:36:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.136 2006/02/24 23:10:08 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -1155,12 +1155,16 @@ */ ATH_TXBUF_LOCK(sc); bf = STAILQ_FIRST(&sc->sc_txbuf); - if (bf != NULL) - STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); + if (bf != NULL) { + if (bf->bf_flags & ATH_FLAG_BUSY) + bf = NULL; + else + STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); + } ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of xmit buffers\n", - __func__); + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: no available xmit buffers\n", __func__); sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; @@ -1181,14 +1185,14 @@ ieee80211_state_name[ic->ic_state]); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); /* XXX: LOCK */ if (m == NULL) { ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } @@ -1275,7 +1279,7 @@ ifp->if_oerrors++; reclaim: ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (ni != NULL) ieee80211_free_node(ni); @@ -2411,7 +2415,7 @@ __func__, dd->dd_name, ds, (u_long) dd->dd_desc_len, (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len); - /* allocate rx buffers */ + /* allocate buffers */ bsize = sizeof(struct ath_buf) * nbuf; bf = malloc(bsize, M_ATHDEV, M_NOWAIT | M_ZERO); if (bf == NULL) { @@ -3687,7 +3691,7 @@ , ctsrate /* rts/cts rate */ , ctsduration /* rts/cts duration */ ); - bf->bf_flags = flags; + bf->bf_txflags = flags; /* * Setup the multi-rate retry state only when we're * going to use it. This assumes ath_hal_setuptxdesc @@ -3758,7 +3762,7 @@ { struct ath_hal *ah = sc->sc_ah; struct ieee80211com *ic = &sc->sc_ic; - struct ath_buf *bf; + struct ath_buf *bf, *last; struct ath_desc *ds, *ds0; struct ieee80211_node *ni; struct ath_node *an; @@ -3790,7 +3794,14 @@ break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); - if (txq->axq_depth == 0) + if (txq->axq_depth > 0) { + /* + * More frames follow. Mark the buffer busy + * so it's not re-used while the hardware may + * still re-read the link field. + */ + bf->bf_flags |= ATH_FLAG_BUSY; + } else txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); @@ -3827,7 +3838,7 @@ * Hand the descriptor to the rate control algorithm. */ if ((ds->ds_txstat.ts_status & HAL_TXERR_FILT) == 0 && - (bf->bf_flags & HAL_TXDESC_NOACK) == 0) { + (bf->bf_txflags & HAL_TXDESC_NOACK) == 0) { /* * If frame was ack'd update the last rx time * used to workaround phantom bmiss interrupts. @@ -3853,6 +3864,9 @@ bf->bf_node = NULL; ATH_TXBUF_LOCK(sc); + last = STAILQ_LAST(&sc->sc_txbuf, ath_buf, bf_list); + if (last != NULL) + last->bf_flags &= ~ATH_FLAG_BUSY; STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } @@ -3968,17 +3982,18 @@ /* * NB: this assumes output has been stopped and - * we do not need to block ath_tx_tasklet + * we do not need to block ath_tx_proc */ for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); bf = STAILQ_FIRST(&txq->axq_q); if (bf == NULL) { - txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); + if (txq->axq_depth == 0) + txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) @@ -3996,10 +4011,16 @@ */ ieee80211_free_node(ni); } + bf->bf_flags &= ~ATH_FLAG_BUSY; ATH_TXBUF_LOCK(sc); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } + ATH_TXBUF_LOCK(sc); + bf = STAILQ_FIRST(&sc->sc_txbuf); + if (bf != NULL) + bf->bf_flags &= ~ATH_FLAG_BUSY; + ATH_TXBUF_UNLOCK(sc); } static void @@ -4877,10 +4898,10 @@ printf("Q%u[%3u]", qnum, ix); for (i = 0, ds = bf->bf_desc; i < bf->bf_nseg; i++, ds++) { - printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n" + printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:%x TF:%04x%s\n" " %08x %08x %08x %08x %08x %08x\n", ds, (struct ath_desc *)bf->bf_daddr + i, - ds->ds_link, ds->ds_data, bf->bf_flags, + ds->ds_link, ds->ds_data, bf->bf_flags, bf->bf_txflags, !done ? "" : (ds->ds_txstat.ts_status == 0) ? " *" : " !", ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]); ==== //depot/projects/arm/src/sys/dev/ath/if_athvar.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.45 2006/02/15 18:23:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.46 2006/02/24 23:10:08 sam Exp $ */ /* @@ -100,7 +100,8 @@ struct ath_buf { STAILQ_ENTRY(ath_buf) bf_list; int bf_nseg; - int bf_flags; /* tx descriptor flags */ + u_int16_t bf_txflags; /* tx descriptor flags */ + u_int16_t bf_flags; /* see below */ struct ath_desc *bf_desc; /* virtual addr of desc */ bus_addr_t bf_daddr; /* physical addr of desc */ bus_dmamap_t bf_dmamap; /* DMA map for mbuf chain */ @@ -112,6 +113,8 @@ }; typedef STAILQ_HEAD(, ath_buf) ath_bufhead; +#define ATH_FLAG_BUSY 0x0001 /* tx descriptor owned by h/w */ + /* * DMA state for tx/rx descriptors. */ @@ -137,7 +140,7 @@ */ struct ath_txq { u_int axq_qnum; /* hardware q number */ - u_int axq_depth; /* queue depth (stat only) */ + int axq_depth; /* queue depth (stat only) */ u_int axq_intrcnt; /* interrupt count */ u_int32_t *axq_link; /* link ptr in last TX desc */ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */ ==== //depot/projects/arm/src/sys/dev/fdc/fdc.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.308 2005/08/30 23:12:18 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.309 2006/02/23 19:11:16 jhb Exp $"); #include "opt_fdc.h" @@ -250,7 +250,6 @@ #define FD_NO_TRACK -2 int options; /* FDOPT_* */ struct callout toffhandle; - struct callout tohandle; struct g_geom *fd_geom; struct g_provider *fd_provider; device_t dev; @@ -617,7 +616,7 @@ int once; fd = arg; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd->flags &= ~FD_MOTORWAIT; fd->flags |= FD_MOTOR; once = 0; @@ -628,7 +627,6 @@ bioq_disksort(&fd->fdc->head, bp); once = 1; } - mtx_unlock(&fd->fdc->fdc_mtx); if (once) wakeup(&fd->fdc->head); } @@ -647,7 +645,7 @@ fdc->fdout |= (FDO_MOEN0 << fd->fdsu); callout_reset(&fd->toffhandle, hz, fd_turnon, fd); } else { - callout_drain(&fd->toffhandle); + callout_stop(&fd->toffhandle); fd->flags &= ~(FD_MOTOR|FD_MOTORWAIT); fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu); } @@ -659,9 +657,8 @@ { struct fd_data *fd = xfd; - mtx_lock(&fd->fdc->fdc_mtx); + mtx_assert(&fd->fdc->fdc_mtx, MA_OWNED); fd_motor(fd, 0); - mtx_unlock(&fd->fdc->fdc_mtx); } /* @@ -1199,7 +1196,7 @@ mtx_lock(&fdc->fdc_mtx); /* If we go from idle, cancel motor turnoff */ if (fd->fd_iocount++ == 0) - callout_drain(&fd->toffhandle); + callout_stop(&fd->toffhandle); if (fd->flags & FD_MOTOR) { /* The motor is on, send it directly to the controller */ bioq_disksort(&fdc->head, bp); @@ -1939,8 +1936,7 @@ fd->fdc = fdc; fd->fdsu = fdsu; fd->options = 0; - callout_init(&fd->toffhandle, 1); - callout_init(&fd->tohandle, 1); + callout_init_mtx(&fd->toffhandle, &fd->fdc->fdc_mtx, 0); /* initialize densities for subdevices */ fdsettype(fd, fd_native_types[fd->type]); ==== //depot/projects/arm/src/sys/dev/ic/z8530.h#2 (text+ko) ==== @@ -23,7 +23,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/dev/ic/z8530.h,v 1.3 2005/01/06 01:42:44 imp Exp $ + * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.4 2006/02/24 02:03:35 marcel Exp $ */ #ifndef _DEV_IC_Z8530_H_ @@ -34,9 +34,12 @@ * Channel B data: 1 * Channel A control: 2 * Channel A data: 3 - * - * We expect a seperate subregion for each channel. */ + +/* The following apply when using a device-scoped bus handle */ +#define CHAN_A 2 +#define CHAN_B 0 + #define REG_CTRL 0 #define REG_DATA 1 @@ -69,7 +72,7 @@ #define RR_BCL 6 /* Byte Count Low. */ #define RR_BCH 7 /* Byte Count High. */ #define RR_RB 8 /* Receive Buffer. */ -#define RR_RPC 9 /* Receive Parameters and Contro. */ +#define RR_RPC 9 /* Receive Parameters and Control. */ #define RR_MSB 10 /* Miscellaneous Status Bits. */ #define RR_MCB1 11 /* Miscellaneous Control Bits (part 1). */ #define RR_TCL 12 /* BRG Time Constant Low. */ ==== //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Message independent structures and definitions * Creation Date: July 27, 2000 * - * mpi.h Version: 01.05.09 + * mpi.h Version: 01.05.10 * * Version History * --------------- @@ -102,6 +102,7 @@ * TargetAssistExtended requests. * Added EEDP IOCStatus codes. * 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT. + * 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target. * -------------------------------------------------------------------------- */ @@ -132,7 +133,7 @@ /* Note: The major versions of 0xe0 through 0xff are reserved */ /* versioning for this MPI header set */ -#define MPI_HEADER_VERSION_UNIT (0x0B) +#define MPI_HEADER_VERSION_UNIT (0x0C) #define MPI_HEADER_VERSION_DEV (0x00) #define MPI_HEADER_VERSION_UNIT_MASK (0xFF00) #define MPI_HEADER_VERSION_UNIT_SHIFT (8) @@ -739,6 +740,8 @@ #define MPI_IOCSTATUS_TARGET_DATA_OFFSET_ERROR (0x006D) #define MPI_IOCSTATUS_TARGET_TOO_MUCH_WRITE_DATA (0x006E) #define MPI_IOCSTATUS_TARGET_IU_TOO_SHORT (0x006F) +#define MPI_IOCSTATUS_TARGET_ACK_NAK_TIMEOUT (0x0070) +#define MPI_IOCSTATUS_TARGET_NAK_RECEIVED (0x0071) /****************************************************************************/ /* Additional FCP target values (obsolete) */ ==== //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_cnfg.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Config message, structures, and Pages * Creation Date: July 27, 2000 * - * mpi_cnfg.h Version: 01.05.10 + * mpi_cnfg.h Version: 01.05.11 * * Version History * --------------- @@ -285,6 +285,14 @@ * Added EnclosureHandle field to SAS Expander page 0. * Removed redundant NumTableEntriesProg field from SAS * Expander Page 1. + * 08-30-05 01.05.11 Added DeviceID for FC949E and changed the DeviceID for + * SAS1078. + * Added more defines for Manufacturing Page 4 Flags field. + * Added more defines for IOCSettings and added + * ExpanderSpinup field to Bios Page 1. + * Added postpone SATA Init bit to SAS IO Unit Page 1 + * ControlFlags. + * Changed LogEntry format for Log Page 0. * -------------------------------------------------------------------------- */ @@ -530,7 +538,7 @@ #define MPI_MANUFACTPAGE_DEVICEID_FC929X (0x0626) #define MPI_MANUFACTPAGE_DEVICEID_FC939X (0x0642) #define MPI_MANUFACTPAGE_DEVICEID_FC949X (0x0640) -#define MPI_MANUFACTPAGE_DEVICEID_FC949ES (0x0646) +#define MPI_MANUFACTPAGE_DEVICEID_FC949E (0x0646) /* SCSI */ #define MPI_MANUFACTPAGE_DEVID_53C1030 (0x0030) #define MPI_MANUFACTPAGE_DEVID_53C1030ZC (0x0031) @@ -546,7 +554,7 @@ #define MPI_MANUFACTPAGE_DEVID_SAS1066E (0x005A) #define MPI_MANUFACTPAGE_DEVID_SAS1068 (0x0054) #define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058) -#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0060) +#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062) typedef struct _CONFIG_PAGE_MANUFACTURING_0 @@ -650,9 +658,14 @@ } CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4, ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t; -#define MPI_MANUFACTURING4_PAGEVERSION (0x02) +#define MPI_MANUFACTURING4_PAGEVERSION (0x03) /* defines for the Flags field */ +#define MPI_MANPAGE4_IME_DISABLE (0x20) +#define MPI_MANPAGE4_IM_DISABLE (0x10) +#define MPI_MANPAGE4_IS_DISABLE (0x08) +#define MPI_MANPAGE4_IR_MODEPAGE8_DISABLE (0x04) +#define MPI_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x02) #define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA (0x01) @@ -1002,7 +1015,8 @@ U32 Reserved1; /* 0Ch */ U32 DeviceSettings; /* 10h */ U16 NumberOfDevices; /* 14h */ - U16 Reserved2; /* 16h */ + U8 ExpanderSpinup; /* 16h */ + U8 Reserved2; /* 17h */ U16 IOTimeoutBlockDevicesNonRM; /* 18h */ U16 IOTimeoutSequential; /* 1Ah */ U16 IOTimeoutOther; /* 1Ch */ @@ -1010,7 +1024,7 @@ } CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1, BIOSPage1_t, MPI_POINTER pBIOSPage1_t; -#define MPI_BIOSPAGE1_PAGEVERSION (0x02) +#define MPI_BIOSPAGE1_PAGEVERSION (0x03) /* values for the BiosOptions field */ #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE (0x00000400) @@ -1019,8 +1033,15 @@ #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS (0x00000001) /* values for the IOCSettings field */ +#define MPI_BIOSPAGE1_IOCSET_MASK_INITIAL_SPINUP_DELAY (0x0F000000) +#define MPI_BIOSPAGE1_IOCSET_SHIFT_INITIAL_SPINUP_DELAY (24) + #define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY (0x00F00000) #define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY (20) + +#define MPI_BIOSPAGE1_IOCSET_AUTO_PORT_ENABLE (0x00080000) +#define MPI_BIOSPAGE1_IOCSET_DIRECT_ATTACH_SPINUP_MODE (0x00040000) + #define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE (0x00030000) #define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT (0x00000000) #define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT (0x00010000) @@ -1050,6 +1071,11 @@ #define MPI_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002) #define MPI_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001) +/* defines for the ExpanderSpinup field */ +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_MAX_TARGET (0xF0) +#define MPI_BIOSPAGE1_EXPSPINUP_SHIFT_MAX_TARGET (4) +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_DELAY (0x0F) + typedef struct _MPI_BOOT_DEVICE_ADAPTER_ORDER { U32 Reserved1; /* 00h */ @@ -1267,13 +1293,13 @@ #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD (8) #define MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MIN_SYNC_PERIOD) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD \ ) #define MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK (0x00FF0000) #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET (16) #define MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MAX_SYNC_OFFSET) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET \ ) #define MPI_SCSIPORTPAGE0_CAP_IDP (0x08000000) @@ -2404,7 +2430,7 @@ } CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1, SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t; -#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x04) +#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x05) /* values for SAS IO Unit Page 1 ControlFlags */ #define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST (0x8000) @@ -2419,6 +2445,7 @@ #define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT (0x01) #define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT (0x02) +#define MPI_SAS_IOUNIT1_CONTROL_POSTPONE_SATA_INIT (0x0100) #define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080) #define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED (0x0040) #define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED (0x0020) @@ -2803,16 +2830,15 @@ #define MPI_LOG_0_NUM_LOG_ENTRIES (1) #endif -#define MPI_LOG_0_LOG_DATA_LENGTH (20) +#define MPI_LOG_0_LOG_DATA_LENGTH (0x1C) typedef struct _MPI_LOG_0_ENTRY { - U64 WWID; /* 00h */ - U32 TimeStamp; /* 08h */ - U32 Reserved1; /* 0Ch */ - U16 LogSequence; /* 10h */ - U16 LogEntryQualifier; /* 12h */ - U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 14h */ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 0Ch */ } MPI_LOG_0_ENTRY, MPI_POINTER PTR_MPI_LOG_0_ENTRY, MpiLog0Entry_t, MPI_POINTER pMpiLog0Entry_t; @@ -2831,7 +2857,7 @@ } CONFIG_PAGE_LOG_0, MPI_POINTER PTR_CONFIG_PAGE_LOG_0, LogPage0_t, MPI_POINTER pLogPage0_t; -#define MPI_LOG_0_PAGEVERSION (0x00) +#define MPI_LOG_0_PAGEVERSION (0x01) #endif ==== //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_ioc.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI IOC, Port, Event, FW Download, and FW Upload messages * Creation Date: August 11, 2000 * - * mpi_ioc.h Version: 01.05.09 + * mpi_ioc.h Version: 01.05.10 * * Version History * --------------- @@ -111,6 +111,10 @@ * Removed IOCFacts Reply EEDP Capability bit. * 06-24-05 01.05.09 Added 5 new IOCFacts Reply IOCCapabilities bits. * Added Max SATA Targets to SAS Discovery Error event. + * 08-30-05 01.05.10 Added 4 new events and their event data structures. + * Added new ReasonCode value for SAS Device Status Change + * event. + * Added new family code for FC949E. * -------------------------------------------------------------------------- */ @@ -492,6 +496,10 @@ #define MPI_EVENT_PERSISTENT_TABLE_FULL (0x00000011) #define MPI_EVENT_SAS_PHY_LINK_STATUS (0x00000012) #define MPI_EVENT_SAS_DISCOVERY_ERROR (0x00000013) +#define MPI_EVENT_IR_RESYNC_UPDATE (0x00000014) +#define MPI_EVENT_IR2 (0x00000015) +#define MPI_EVENT_SAS_DISCOVERY (0x00000016) +#define MPI_EVENT_LOG_ENTRY_ADDED (0x00000021) /* AckRequired field values */ @@ -508,6 +516,29 @@ } EVENT_DATA_EVENT_CHANGE, MPI_POINTER PTR_EVENT_DATA_EVENT_CHANGE, EventDataEventChange_t, MPI_POINTER pEventDataEventChange_t; +/* LogEntryAdded Event data */ + +/* this structure matches MPI_LOG_0_ENTRY in mpi_cnfg.h */ +#define MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH (0x1C) +typedef struct _EVENT_DATA_LOG_ENTRY +{ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH]; /* 0Ch */ +} EVENT_DATA_LOG_ENTRY, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY, + MpiEventDataLogEntry_t, MPI_POINTER pMpiEventDataLogEntry_t; + +typedef struct _EVENT_DATA_LOG_ENTRY_ADDED +{ + U16 LogSequence; /* 00h */ + U16 Reserved1; /* 02h */ + U32 Reserved2; /* 04h */ + EVENT_DATA_LOG_ENTRY LogEntry; /* 08h */ +} EVENT_DATA_LOG_ENTRY_ADDED, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY_ADDED, + MpiEventDataLogEntryAdded_t, MPI_POINTER pMpiEventDataLogEntryAdded_t; + /* SCSI Event data for Port, Bus and Device forms */ typedef struct _EVENT_DATA_SCSI @@ -566,6 +597,7 @@ #define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA (0x05) #define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED (0x06) #define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED (0x07) +#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET (0x08) /* SCSI Event data for Queue Full event */ @@ -607,6 +639,79 @@ #define MPI_EVENT_RAID_RC_SMART_DATA (0x0A) #define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B) + +/* MPI Integrated RAID Resync Update Event data */ + +typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE +{ + U8 VolumeID; /* 00h */ + U8 VolumeBus; /* 01h */ + U8 ResyncComplete; /* 02h */ + U8 Reserved1; /* 03h */ + U32 Reserved2; /* 04h */ +} MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MPI_POINTER PTR_MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MpiEventDataIrResyncUpdate_t, MPI_POINTER pMpiEventDataIrResyncUpdate_t; + +/* MPI IR2 Event data */ + +/* MPI_LD_STATE or MPI_PD_STATE */ +typedef struct _IR2_STATE_CHANGED +{ + U16 PreviousState; /* 00h */ + U16 NewState; /* 02h */ +} IR2_STATE_CHANGED, MPI_POINTER PTR_IR2_STATE_CHANGED; + +typedef struct _IR2_PD_INFO +{ + U16 DeviceHandle; /* 00h */ + U8 TruncEnclosureHandle; /* 02h */ + U8 TruncatedSlot; /* 03h */ +} IR2_PD_INFO, MPI_POINTER PTR_IR2_PD_INFO; + +typedef union _MPI_IR2_RC_EVENT_DATA +{ + IR2_STATE_CHANGED StateChanged; + U32 Lba; + IR2_PD_INFO PdInfo; +} MPI_IR2_RC_EVENT_DATA, MPI_POINTER PTR_MPI_IR2_RC_EVENT_DATA; + +typedef struct _MPI_EVENT_DATA_IR2 +{ + U8 TargetID; /* 00h */ + U8 Bus; /* 01h */ + U8 ReasonCode; /* 02h */ + U8 PhysDiskNum; /* 03h */ + MPI_IR2_RC_EVENT_DATA IR2EventData; /* 04h */ +} MPI_EVENT_DATA_IR2, MPI_POINTER PTR_MPI_EVENT_DATA_IR2, + MpiEventDataIR2_t, MPI_POINTER pMpiEventDataIR2_t; + +/* MPI IR2 Event data ReasonCode values */ +#define MPI_EVENT_IR2_RC_LD_STATE_CHANGED (0x01) +#define MPI_EVENT_IR2_RC_PD_STATE_CHANGED (0x02) +#define MPI_EVENT_IR2_RC_BAD_BLOCK_TABLE_FULL (0x03) +#define MPI_EVENT_IR2_RC_PD_INSERTED (0x04) +#define MPI_EVENT_IR2_RC_PD_REMOVED (0x05) +#define MPI_EVENT_IR2_RC_FOREIGN_CFG_DETECTED (0x06) +#define MPI_EVENT_IR2_RC_REBUILD_MEDIUM_ERROR (0x07) + +/* defines for logical disk states */ +#define MPI_LD_STATE_OPTIMAL (0x00) +#define MPI_LD_STATE_DEGRADED (0x01) +#define MPI_LD_STATE_FAILED (0x02) +#define MPI_LD_STATE_MISSING (0x03) +#define MPI_LD_STATE_OFFLINE (0x04) + +/* defines for physical disk states */ +#define MPI_PD_STATE_ONLINE (0x00) +#define MPI_PD_STATE_MISSING (0x01) +#define MPI_PD_STATE_NOT_COMPATIBLE (0x02) +#define MPI_PD_STATE_FAILED (0x03) +#define MPI_PD_STATE_INITIALIZING (0x04) +#define MPI_PD_STATE_OFFLINE_AT_HOST_REQUEST (0x05) +#define MPI_PD_STATE_FAILED_AT_HOST_REQUEST (0x06) +#define MPI_PD_STATE_OFFLINE_FOR_ANOTHER_REASON (0xFF) + /* MPI Link Status Change Event data */ typedef struct _EVENT_DATA_LINK_STATUS @@ -688,6 +793,20 @@ #define MPI_EVENT_SAS_PLS_LR_RATE_1_5 (0x08) #define MPI_EVENT_SAS_PLS_LR_RATE_3_0 (0x09) +/* SAS Discovery Event data */ + +typedef struct _EVENT_DATA_SAS_DISCOVERY +{ + U32 DiscoveryStatus; /* 00h */ + U32 Reserved1; /* 04h */ +} EVENT_DATA_SAS_DISCOVERY, MPI_POINTER PTR_EVENT_DATA_SAS_DISCOVERY, + EventDataSasDiscovery_t, MPI_POINTER pEventDataSasDiscovery_t; + +#define MPI_EVENT_SAS_DSCVRY_COMPLETE (0x00000000) +#define MPI_EVENT_SAS_DSCVRY_IN_PROGRESS (0x00000001) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) + /* SAS Discovery Errror Event data */ typedef struct _EVENT_DATA_DISCOVERY_ERROR @@ -897,6 +1016,7 @@ #define MPI_FW_HEADER_PID_FAMILY_919XL_FC (0x0003) /* 919XL and 929XL */ #define MPI_FW_HEADER_PID_FAMILY_939X_FC (0x0004) /* 939X and 949X */ #define MPI_FW_HEADER_PID_FAMILY_959_FC (0x0005) +#define MPI_FW_HEADER_PID_FAMILY_949E_FC (0x0006) /* SAS */ #define MPI_FW_HEADER_PID_FAMILY_1064_SAS (0x0001) #define MPI_FW_HEADER_PID_FAMILY_1068_SAS (0x0002) ==== //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_sas.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.1 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.2 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI Serial Attached SCSI structures and definitions * Creation Date: August 19, 2004 * - * mpi_sas.h Version: 01.05.01 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 25 17:46:08 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 DE94216A423; Sat, 25 Feb 2006 17:46:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE66B16A420 for ; Sat, 25 Feb 2006 17:46:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 681B243D45 for ; Sat, 25 Feb 2006 17:46:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1PHk7qo018169 for ; Sat, 25 Feb 2006 17:46:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1PHk7L7018166 for perforce@freebsd.org; Sat, 25 Feb 2006 17:46:07 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Feb 2006 17:46:07 GMT Message-Id: <200602251746.k1PHk7L7018166@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 92384 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: Sat, 25 Feb 2006 17:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92384 Change 92384 by marcel@marcel_nfs on 2006/02/25 17:45:24 IFC @92383 Affected files ... .. //depot/projects/uart/dev/ata/ata-all.c#17 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#14 integrate .. //depot/projects/uart/dev/ath/if_ath.c#23 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#17 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/uart/dev/mpt/mpt.c#8 integrate .. //depot/projects/uart/dev/mpt/mpt.h#6 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#8 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#13 integrate .. //depot/projects/uart/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/uart/i386/cpufreq/est.c#4 integrate .. //depot/projects/uart/kern/subr_prf.c#8 integrate .. //depot/projects/uart/modules/if_ef/Makefile#4 integrate .. //depot/projects/uart/net/if_vlan.c#13 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#16 integrate Differences ... ==== //depot/projects/uart/dev/ata/ata-all.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.264 2006/02/09 20:54:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.265 2006/02/25 17:27:32 sos Exp $"); #include "opt_ata.h" #include @@ -160,6 +160,11 @@ if (!ch->r_irq) return ENXIO; + /* grap the channel lock so no new requests gets launched */ + mtx_lock(&ch->state_mtx); + ch->state |= ATA_STALL_QUEUE; + mtx_unlock(&ch->state_mtx); + /* detach & delete all children */ if (!device_get_children(dev, &children, &nchildren)) { for (i = 0; i < nchildren; i++) @@ -196,9 +201,14 @@ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) tsleep(&dev, PRIBIO, "atarini", 1); + /* catch eventual request in ch->running */ + mtx_lock(&ch->state_mtx); + if ((request = ch->running)) + callout_stop(&request->callout); + ch->running = NULL; + /* unconditionally grap the channel lock */ - mtx_lock(&ch->state_mtx); - ch->state = ATA_STALL_QUEUE; + ch->state |= ATA_STALL_QUEUE; mtx_unlock(&ch->state_mtx); /* reset the controller HW, the channel and device(s) */ @@ -208,48 +218,32 @@ if (!device_get_children(dev, &children, &nchildren)) { mtx_lock(&Giant); /* newbus suckage it needs Giant */ for (i = 0; i < nchildren; i++) { - if (children[i] && device_is_attached(children[i])) - if (ATA_REINIT(children[i])) { - /* - * if we have a running request and its device matches - * this child we need to inform the request that the - * device is gone and remove it from ch->running - */ - mtx_lock(&ch->state_mtx); - if (ch->running && ch->running->dev == children[i]) { - callout_stop(&ch->running->callout); - request = ch->running; - ch->running = NULL; - } - else - request = NULL; - mtx_unlock(&ch->state_mtx); + /* did any children go missing ? */ + if (children[i] && device_is_attached(children[i]) && + ATA_REINIT(children[i])) { + /* + * if we had a running request and its device matches + * this child we need to inform the request that the + * device is gone. + */ + if (request && request->dev == children[i]) { + request->result = ENXIO; + device_printf(request->dev, "FAILURE - device detached\n"); - if (request) { - request->result = ENXIO; - device_printf(request->dev, - "FAILURE - device detached\n"); - - /* if not timeout finish request here */ - if (!(request->flags & ATA_R_TIMEOUT)) + /* if not timeout finish request here */ + if (!(request->flags & ATA_R_TIMEOUT)) ata_finish(request); - } - device_delete_child(dev, children[i]); + request = NULL; } + device_delete_child(dev, children[i]); + } } free(children, M_TEMP); mtx_unlock(&Giant); /* newbus suckage dealt with, release Giant */ } - /* catch request in ch->running if we havn't already */ - mtx_lock(&ch->state_mtx); - if ((request = ch->running)) - callout_stop(&request->callout); - ch->running = NULL; - mtx_unlock(&ch->state_mtx); - - /* if we got one put it on the queue again */ - if (request) { + /* if we still have a good request put it on the queue again */ + if (request && !(request->flags & ATA_R_TIMEOUT)) { device_printf(request->dev, "WARNING - %s requeued due to channel reset", ata_cmd2str(request)); @@ -335,7 +329,7 @@ ATA_DEBUG_RQ(request, "interrupt"); /* safetycheck for the right state */ - if (ch->state != ATA_ACTIVE && ch->state != ATA_STALL_QUEUE) { + if (ch->state == ATA_IDLE) { device_printf(request->dev, "interrupt on idle channel ignored\n"); break; } ==== //depot/projects/uart/dev/ata/ata-queue.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.56 2006/02/23 20:15:22 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.57 2006/02/25 17:27:33 sos Exp $"); #include "opt_ata.h" #include @@ -61,7 +61,7 @@ if (!request->callback && !(request->flags & ATA_R_REQUEUE)) sema_init(&request->done, 0, "ATA request done"); - /* in ATA_STALL_QUEUE state we call HW directly (used only during reinit) */ + /* in ATA_STALL_QUEUE state we call HW directly */ if ((ch->state & ATA_STALL_QUEUE) && (request->flags & ATA_R_CONTROL)) { mtx_lock(&ch->state_mtx); ch->running = request; @@ -505,7 +505,6 @@ if ((request = ch->running) && (!dev || request->dev == dev)) { callout_stop(&request->callout); ch->running = NULL; - ch->state = ATA_IDLE; request->result = ENXIO; TAILQ_INSERT_TAIL(&fail_requests, request, chain); } @@ -527,9 +526,6 @@ TAILQ_REMOVE(&fail_requests, request, chain); ata_finish(request); } - - /* we might have work for the other device on this channel */ - ata_start(ch->dev); } static u_int64_t ==== //depot/projects/uart/dev/ath/if_ath.c#23 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.135 2006/02/15 18:36:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.136 2006/02/24 23:10:08 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -1155,12 +1155,16 @@ */ ATH_TXBUF_LOCK(sc); bf = STAILQ_FIRST(&sc->sc_txbuf); - if (bf != NULL) - STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); + if (bf != NULL) { + if (bf->bf_flags & ATH_FLAG_BUSY) + bf = NULL; + else + STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); + } ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of xmit buffers\n", - __func__); + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: no available xmit buffers\n", __func__); sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; @@ -1181,14 +1185,14 @@ ieee80211_state_name[ic->ic_state]); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); /* XXX: LOCK */ if (m == NULL) { ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } @@ -1275,7 +1279,7 @@ ifp->if_oerrors++; reclaim: ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (ni != NULL) ieee80211_free_node(ni); @@ -2411,7 +2415,7 @@ __func__, dd->dd_name, ds, (u_long) dd->dd_desc_len, (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len); - /* allocate rx buffers */ + /* allocate buffers */ bsize = sizeof(struct ath_buf) * nbuf; bf = malloc(bsize, M_ATHDEV, M_NOWAIT | M_ZERO); if (bf == NULL) { @@ -3687,7 +3691,7 @@ , ctsrate /* rts/cts rate */ , ctsduration /* rts/cts duration */ ); - bf->bf_flags = flags; + bf->bf_txflags = flags; /* * Setup the multi-rate retry state only when we're * going to use it. This assumes ath_hal_setuptxdesc @@ -3758,7 +3762,7 @@ { struct ath_hal *ah = sc->sc_ah; struct ieee80211com *ic = &sc->sc_ic; - struct ath_buf *bf; + struct ath_buf *bf, *last; struct ath_desc *ds, *ds0; struct ieee80211_node *ni; struct ath_node *an; @@ -3790,7 +3794,14 @@ break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); - if (txq->axq_depth == 0) + if (txq->axq_depth > 0) { + /* + * More frames follow. Mark the buffer busy + * so it's not re-used while the hardware may + * still re-read the link field. + */ + bf->bf_flags |= ATH_FLAG_BUSY; + } else txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); @@ -3827,7 +3838,7 @@ * Hand the descriptor to the rate control algorithm. */ if ((ds->ds_txstat.ts_status & HAL_TXERR_FILT) == 0 && - (bf->bf_flags & HAL_TXDESC_NOACK) == 0) { + (bf->bf_txflags & HAL_TXDESC_NOACK) == 0) { /* * If frame was ack'd update the last rx time * used to workaround phantom bmiss interrupts. @@ -3853,6 +3864,9 @@ bf->bf_node = NULL; ATH_TXBUF_LOCK(sc); + last = STAILQ_LAST(&sc->sc_txbuf, ath_buf, bf_list); + if (last != NULL) + last->bf_flags &= ~ATH_FLAG_BUSY; STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } @@ -3968,17 +3982,18 @@ /* * NB: this assumes output has been stopped and - * we do not need to block ath_tx_tasklet + * we do not need to block ath_tx_proc */ for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); bf = STAILQ_FIRST(&txq->axq_q); if (bf == NULL) { - txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); + if (txq->axq_depth == 0) + txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) @@ -3996,10 +4011,16 @@ */ ieee80211_free_node(ni); } + bf->bf_flags &= ~ATH_FLAG_BUSY; ATH_TXBUF_LOCK(sc); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } + ATH_TXBUF_LOCK(sc); + bf = STAILQ_FIRST(&sc->sc_txbuf); + if (bf != NULL) + bf->bf_flags &= ~ATH_FLAG_BUSY; + ATH_TXBUF_UNLOCK(sc); } static void @@ -4877,10 +4898,10 @@ printf("Q%u[%3u]", qnum, ix); for (i = 0, ds = bf->bf_desc; i < bf->bf_nseg; i++, ds++) { - printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n" + printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:%x TF:%04x%s\n" " %08x %08x %08x %08x %08x %08x\n", ds, (struct ath_desc *)bf->bf_daddr + i, - ds->ds_link, ds->ds_data, bf->bf_flags, + ds->ds_link, ds->ds_data, bf->bf_flags, bf->bf_txflags, !done ? "" : (ds->ds_txstat.ts_status == 0) ? " *" : " !", ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]); ==== //depot/projects/uart/dev/ath/if_athvar.h#17 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.45 2006/02/15 18:23:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.46 2006/02/24 23:10:08 sam Exp $ */ /* @@ -100,7 +100,8 @@ struct ath_buf { STAILQ_ENTRY(ath_buf) bf_list; int bf_nseg; - int bf_flags; /* tx descriptor flags */ + u_int16_t bf_txflags; /* tx descriptor flags */ + u_int16_t bf_flags; /* see below */ struct ath_desc *bf_desc; /* virtual addr of desc */ bus_addr_t bf_daddr; /* physical addr of desc */ bus_dmamap_t bf_dmamap; /* DMA map for mbuf chain */ @@ -112,6 +113,8 @@ }; typedef STAILQ_HEAD(, ath_buf) ath_bufhead; +#define ATH_FLAG_BUSY 0x0001 /* tx descriptor owned by h/w */ + /* * DMA state for tx/rx descriptors. */ @@ -137,7 +140,7 @@ */ struct ath_txq { u_int axq_qnum; /* hardware q number */ - u_int axq_depth; /* queue depth (stat only) */ + int axq_depth; /* queue depth (stat only) */ u_int axq_intrcnt; /* interrupt count */ u_int32_t *axq_link; /* link ptr in last TX desc */ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */ ==== //depot/projects/uart/dev/mpt/mpilib/mpi.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Message independent structures and definitions * Creation Date: July 27, 2000 * - * mpi.h Version: 01.05.09 + * mpi.h Version: 01.05.10 * * Version History * --------------- @@ -102,6 +102,7 @@ * TargetAssistExtended requests. * Added EEDP IOCStatus codes. * 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT. + * 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target. * -------------------------------------------------------------------------- */ @@ -132,7 +133,7 @@ /* Note: The major versions of 0xe0 through 0xff are reserved */ /* versioning for this MPI header set */ -#define MPI_HEADER_VERSION_UNIT (0x0B) +#define MPI_HEADER_VERSION_UNIT (0x0C) #define MPI_HEADER_VERSION_DEV (0x00) #define MPI_HEADER_VERSION_UNIT_MASK (0xFF00) #define MPI_HEADER_VERSION_UNIT_SHIFT (8) @@ -739,6 +740,8 @@ #define MPI_IOCSTATUS_TARGET_DATA_OFFSET_ERROR (0x006D) #define MPI_IOCSTATUS_TARGET_TOO_MUCH_WRITE_DATA (0x006E) #define MPI_IOCSTATUS_TARGET_IU_TOO_SHORT (0x006F) +#define MPI_IOCSTATUS_TARGET_ACK_NAK_TIMEOUT (0x0070) +#define MPI_IOCSTATUS_TARGET_NAK_RECEIVED (0x0071) /****************************************************************************/ /* Additional FCP target values (obsolete) */ ==== //depot/projects/uart/dev/mpt/mpilib/mpi_cnfg.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Config message, structures, and Pages * Creation Date: July 27, 2000 * - * mpi_cnfg.h Version: 01.05.10 + * mpi_cnfg.h Version: 01.05.11 * * Version History * --------------- @@ -285,6 +285,14 @@ * Added EnclosureHandle field to SAS Expander page 0. * Removed redundant NumTableEntriesProg field from SAS * Expander Page 1. + * 08-30-05 01.05.11 Added DeviceID for FC949E and changed the DeviceID for + * SAS1078. + * Added more defines for Manufacturing Page 4 Flags field. + * Added more defines for IOCSettings and added + * ExpanderSpinup field to Bios Page 1. + * Added postpone SATA Init bit to SAS IO Unit Page 1 + * ControlFlags. + * Changed LogEntry format for Log Page 0. * -------------------------------------------------------------------------- */ @@ -530,7 +538,7 @@ #define MPI_MANUFACTPAGE_DEVICEID_FC929X (0x0626) #define MPI_MANUFACTPAGE_DEVICEID_FC939X (0x0642) #define MPI_MANUFACTPAGE_DEVICEID_FC949X (0x0640) -#define MPI_MANUFACTPAGE_DEVICEID_FC949ES (0x0646) +#define MPI_MANUFACTPAGE_DEVICEID_FC949E (0x0646) /* SCSI */ #define MPI_MANUFACTPAGE_DEVID_53C1030 (0x0030) #define MPI_MANUFACTPAGE_DEVID_53C1030ZC (0x0031) @@ -546,7 +554,7 @@ #define MPI_MANUFACTPAGE_DEVID_SAS1066E (0x005A) #define MPI_MANUFACTPAGE_DEVID_SAS1068 (0x0054) #define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058) -#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0060) +#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062) typedef struct _CONFIG_PAGE_MANUFACTURING_0 @@ -650,9 +658,14 @@ } CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4, ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t; -#define MPI_MANUFACTURING4_PAGEVERSION (0x02) +#define MPI_MANUFACTURING4_PAGEVERSION (0x03) /* defines for the Flags field */ +#define MPI_MANPAGE4_IME_DISABLE (0x20) +#define MPI_MANPAGE4_IM_DISABLE (0x10) +#define MPI_MANPAGE4_IS_DISABLE (0x08) +#define MPI_MANPAGE4_IR_MODEPAGE8_DISABLE (0x04) +#define MPI_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x02) #define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA (0x01) @@ -1002,7 +1015,8 @@ U32 Reserved1; /* 0Ch */ U32 DeviceSettings; /* 10h */ U16 NumberOfDevices; /* 14h */ - U16 Reserved2; /* 16h */ + U8 ExpanderSpinup; /* 16h */ + U8 Reserved2; /* 17h */ U16 IOTimeoutBlockDevicesNonRM; /* 18h */ U16 IOTimeoutSequential; /* 1Ah */ U16 IOTimeoutOther; /* 1Ch */ @@ -1010,7 +1024,7 @@ } CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1, BIOSPage1_t, MPI_POINTER pBIOSPage1_t; -#define MPI_BIOSPAGE1_PAGEVERSION (0x02) +#define MPI_BIOSPAGE1_PAGEVERSION (0x03) /* values for the BiosOptions field */ #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE (0x00000400) @@ -1019,8 +1033,15 @@ #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS (0x00000001) /* values for the IOCSettings field */ +#define MPI_BIOSPAGE1_IOCSET_MASK_INITIAL_SPINUP_DELAY (0x0F000000) +#define MPI_BIOSPAGE1_IOCSET_SHIFT_INITIAL_SPINUP_DELAY (24) + #define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY (0x00F00000) #define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY (20) + +#define MPI_BIOSPAGE1_IOCSET_AUTO_PORT_ENABLE (0x00080000) +#define MPI_BIOSPAGE1_IOCSET_DIRECT_ATTACH_SPINUP_MODE (0x00040000) + #define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE (0x00030000) #define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT (0x00000000) #define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT (0x00010000) @@ -1050,6 +1071,11 @@ #define MPI_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002) #define MPI_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001) +/* defines for the ExpanderSpinup field */ +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_MAX_TARGET (0xF0) +#define MPI_BIOSPAGE1_EXPSPINUP_SHIFT_MAX_TARGET (4) +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_DELAY (0x0F) + typedef struct _MPI_BOOT_DEVICE_ADAPTER_ORDER { U32 Reserved1; /* 00h */ @@ -1267,13 +1293,13 @@ #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD (8) #define MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MIN_SYNC_PERIOD) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD \ ) #define MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK (0x00FF0000) #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET (16) #define MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MAX_SYNC_OFFSET) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET \ ) #define MPI_SCSIPORTPAGE0_CAP_IDP (0x08000000) @@ -2404,7 +2430,7 @@ } CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1, SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t; -#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x04) +#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x05) /* values for SAS IO Unit Page 1 ControlFlags */ #define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST (0x8000) @@ -2419,6 +2445,7 @@ #define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT (0x01) #define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT (0x02) +#define MPI_SAS_IOUNIT1_CONTROL_POSTPONE_SATA_INIT (0x0100) #define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080) #define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED (0x0040) #define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED (0x0020) @@ -2803,16 +2830,15 @@ #define MPI_LOG_0_NUM_LOG_ENTRIES (1) #endif -#define MPI_LOG_0_LOG_DATA_LENGTH (20) +#define MPI_LOG_0_LOG_DATA_LENGTH (0x1C) typedef struct _MPI_LOG_0_ENTRY { - U64 WWID; /* 00h */ - U32 TimeStamp; /* 08h */ - U32 Reserved1; /* 0Ch */ - U16 LogSequence; /* 10h */ - U16 LogEntryQualifier; /* 12h */ - U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 14h */ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 0Ch */ } MPI_LOG_0_ENTRY, MPI_POINTER PTR_MPI_LOG_0_ENTRY, MpiLog0Entry_t, MPI_POINTER pMpiLog0Entry_t; @@ -2831,7 +2857,7 @@ } CONFIG_PAGE_LOG_0, MPI_POINTER PTR_CONFIG_PAGE_LOG_0, LogPage0_t, MPI_POINTER pLogPage0_t; -#define MPI_LOG_0_PAGEVERSION (0x00) +#define MPI_LOG_0_PAGEVERSION (0x01) #endif ==== //depot/projects/uart/dev/mpt/mpilib/mpi_ioc.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI IOC, Port, Event, FW Download, and FW Upload messages * Creation Date: August 11, 2000 * - * mpi_ioc.h Version: 01.05.09 + * mpi_ioc.h Version: 01.05.10 * * Version History * --------------- @@ -111,6 +111,10 @@ * Removed IOCFacts Reply EEDP Capability bit. * 06-24-05 01.05.09 Added 5 new IOCFacts Reply IOCCapabilities bits. * Added Max SATA Targets to SAS Discovery Error event. + * 08-30-05 01.05.10 Added 4 new events and their event data structures. + * Added new ReasonCode value for SAS Device Status Change + * event. + * Added new family code for FC949E. * -------------------------------------------------------------------------- */ @@ -492,6 +496,10 @@ #define MPI_EVENT_PERSISTENT_TABLE_FULL (0x00000011) #define MPI_EVENT_SAS_PHY_LINK_STATUS (0x00000012) #define MPI_EVENT_SAS_DISCOVERY_ERROR (0x00000013) +#define MPI_EVENT_IR_RESYNC_UPDATE (0x00000014) +#define MPI_EVENT_IR2 (0x00000015) +#define MPI_EVENT_SAS_DISCOVERY (0x00000016) +#define MPI_EVENT_LOG_ENTRY_ADDED (0x00000021) /* AckRequired field values */ @@ -508,6 +516,29 @@ } EVENT_DATA_EVENT_CHANGE, MPI_POINTER PTR_EVENT_DATA_EVENT_CHANGE, EventDataEventChange_t, MPI_POINTER pEventDataEventChange_t; +/* LogEntryAdded Event data */ + +/* this structure matches MPI_LOG_0_ENTRY in mpi_cnfg.h */ +#define MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH (0x1C) +typedef struct _EVENT_DATA_LOG_ENTRY +{ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH]; /* 0Ch */ +} EVENT_DATA_LOG_ENTRY, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY, + MpiEventDataLogEntry_t, MPI_POINTER pMpiEventDataLogEntry_t; + +typedef struct _EVENT_DATA_LOG_ENTRY_ADDED +{ + U16 LogSequence; /* 00h */ + U16 Reserved1; /* 02h */ + U32 Reserved2; /* 04h */ + EVENT_DATA_LOG_ENTRY LogEntry; /* 08h */ +} EVENT_DATA_LOG_ENTRY_ADDED, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY_ADDED, + MpiEventDataLogEntryAdded_t, MPI_POINTER pMpiEventDataLogEntryAdded_t; + /* SCSI Event data for Port, Bus and Device forms */ typedef struct _EVENT_DATA_SCSI @@ -566,6 +597,7 @@ #define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA (0x05) #define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED (0x06) #define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED (0x07) +#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET (0x08) /* SCSI Event data for Queue Full event */ @@ -607,6 +639,79 @@ #define MPI_EVENT_RAID_RC_SMART_DATA (0x0A) #define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B) + +/* MPI Integrated RAID Resync Update Event data */ + +typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE +{ + U8 VolumeID; /* 00h */ + U8 VolumeBus; /* 01h */ + U8 ResyncComplete; /* 02h */ + U8 Reserved1; /* 03h */ + U32 Reserved2; /* 04h */ +} MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MPI_POINTER PTR_MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MpiEventDataIrResyncUpdate_t, MPI_POINTER pMpiEventDataIrResyncUpdate_t; + +/* MPI IR2 Event data */ + +/* MPI_LD_STATE or MPI_PD_STATE */ +typedef struct _IR2_STATE_CHANGED +{ + U16 PreviousState; /* 00h */ + U16 NewState; /* 02h */ +} IR2_STATE_CHANGED, MPI_POINTER PTR_IR2_STATE_CHANGED; + +typedef struct _IR2_PD_INFO +{ + U16 DeviceHandle; /* 00h */ + U8 TruncEnclosureHandle; /* 02h */ + U8 TruncatedSlot; /* 03h */ +} IR2_PD_INFO, MPI_POINTER PTR_IR2_PD_INFO; + +typedef union _MPI_IR2_RC_EVENT_DATA +{ + IR2_STATE_CHANGED StateChanged; + U32 Lba; + IR2_PD_INFO PdInfo; +} MPI_IR2_RC_EVENT_DATA, MPI_POINTER PTR_MPI_IR2_RC_EVENT_DATA; + +typedef struct _MPI_EVENT_DATA_IR2 +{ + U8 TargetID; /* 00h */ + U8 Bus; /* 01h */ + U8 ReasonCode; /* 02h */ + U8 PhysDiskNum; /* 03h */ + MPI_IR2_RC_EVENT_DATA IR2EventData; /* 04h */ +} MPI_EVENT_DATA_IR2, MPI_POINTER PTR_MPI_EVENT_DATA_IR2, + MpiEventDataIR2_t, MPI_POINTER pMpiEventDataIR2_t; + +/* MPI IR2 Event data ReasonCode values */ +#define MPI_EVENT_IR2_RC_LD_STATE_CHANGED (0x01) +#define MPI_EVENT_IR2_RC_PD_STATE_CHANGED (0x02) +#define MPI_EVENT_IR2_RC_BAD_BLOCK_TABLE_FULL (0x03) +#define MPI_EVENT_IR2_RC_PD_INSERTED (0x04) +#define MPI_EVENT_IR2_RC_PD_REMOVED (0x05) +#define MPI_EVENT_IR2_RC_FOREIGN_CFG_DETECTED (0x06) +#define MPI_EVENT_IR2_RC_REBUILD_MEDIUM_ERROR (0x07) + +/* defines for logical disk states */ +#define MPI_LD_STATE_OPTIMAL (0x00) +#define MPI_LD_STATE_DEGRADED (0x01) +#define MPI_LD_STATE_FAILED (0x02) +#define MPI_LD_STATE_MISSING (0x03) +#define MPI_LD_STATE_OFFLINE (0x04) + +/* defines for physical disk states */ +#define MPI_PD_STATE_ONLINE (0x00) +#define MPI_PD_STATE_MISSING (0x01) +#define MPI_PD_STATE_NOT_COMPATIBLE (0x02) +#define MPI_PD_STATE_FAILED (0x03) +#define MPI_PD_STATE_INITIALIZING (0x04) +#define MPI_PD_STATE_OFFLINE_AT_HOST_REQUEST (0x05) +#define MPI_PD_STATE_FAILED_AT_HOST_REQUEST (0x06) +#define MPI_PD_STATE_OFFLINE_FOR_ANOTHER_REASON (0xFF) + /* MPI Link Status Change Event data */ typedef struct _EVENT_DATA_LINK_STATUS @@ -688,6 +793,20 @@ #define MPI_EVENT_SAS_PLS_LR_RATE_1_5 (0x08) #define MPI_EVENT_SAS_PLS_LR_RATE_3_0 (0x09) +/* SAS Discovery Event data */ + +typedef struct _EVENT_DATA_SAS_DISCOVERY +{ + U32 DiscoveryStatus; /* 00h */ + U32 Reserved1; /* 04h */ +} EVENT_DATA_SAS_DISCOVERY, MPI_POINTER PTR_EVENT_DATA_SAS_DISCOVERY, + EventDataSasDiscovery_t, MPI_POINTER pEventDataSasDiscovery_t; + +#define MPI_EVENT_SAS_DSCVRY_COMPLETE (0x00000000) +#define MPI_EVENT_SAS_DSCVRY_IN_PROGRESS (0x00000001) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) + /* SAS Discovery Errror Event data */ typedef struct _EVENT_DATA_DISCOVERY_ERROR @@ -897,6 +1016,7 @@ #define MPI_FW_HEADER_PID_FAMILY_919XL_FC (0x0003) /* 919XL and 929XL */ #define MPI_FW_HEADER_PID_FAMILY_939X_FC (0x0004) /* 939X and 949X */ #define MPI_FW_HEADER_PID_FAMILY_959_FC (0x0005) +#define MPI_FW_HEADER_PID_FAMILY_949E_FC (0x0006) /* SAS */ #define MPI_FW_HEADER_PID_FAMILY_1064_SAS (0x0001) #define MPI_FW_HEADER_PID_FAMILY_1068_SAS (0x0002) ==== //depot/projects/uart/dev/mpt/mpilib/mpi_sas.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.1 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.2 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI Serial Attached SCSI structures and definitions * Creation Date: August 19, 2004 * - * mpi_sas.h Version: 01.05.01 + * mpi_sas.h Version: 01.05.02 * * Version History * --------------- @@ -42,6 +42,9 @@ * Date Version Description * -------- -------- ------------------------------------------------------ * 08-19-04 01.05.01 Original release. + * 08-30-05 01.05.02 Added DeviceInfo bit for SEP. + * Added PrimFlags and Primitive field to SAS IO Unit + * Control request, and added a new operation code. * -------------------------------------------------------------------------- */ @@ -79,6 +82,7 @@ * Values for the SAS DeviceInfo field used in SAS Device Status Change Event * data and SAS IO Unit Configuration pages. */ +#define MPI_SAS_DEVICE_INFO_SEP (0x00004000) #define MPI_SAS_DEVICE_INFO_ATAPI_DEVICE (0x00002000) #define MPI_SAS_DEVICE_INFO_LSI_DEVICE (0x00001000) #define MPI_SAS_DEVICE_INFO_DIRECT_ATTACH (0x00000800) @@ -240,10 +244,10 @@ U8 TargetID; /* 0Ch */ U8 Bus; /* 0Dh */ U8 PhyNum; /* 0Eh */ - U8 Reserved4; /* 0Fh */ - U32 Reserved5; /* 10h */ + U8 PrimFlags; /* 0Fh */ + U32 Primitive; /* 10h */ U64 SASAddress; /* 14h */ - U32 Reserved6; /* 1Ch */ + U32 Reserved4; /* 1Ch */ } MSG_SAS_IOUNIT_CONTROL_REQUEST, MPI_POINTER PTR_MSG_SAS_IOUNIT_CONTROL_REQUEST, SasIoUnitControlRequest_t, MPI_POINTER pSasIoUnitControlRequest_t; @@ -254,7 +258,13 @@ #define MPI_SAS_OP_PHY_HARD_RESET (0x07) #define MPI_SAS_OP_PHY_CLEAR_ERROR_LOG (0x08) #define MPI_SAS_OP_MAP_CURRENT (0x09) +#define MPI_SAS_OP_SEND_PRIMITIVE (0x0A) +/* values for the PrimFlags field */ +#define MPI_SAS_PRIMFLAGS_SINGLE (0x08) +#define MPI_SAS_PRIMFLAGS_TRIPLE (0x02) +#define MPI_SAS_PRIMFLAGS_REDUNDANT (0x01) + /* SAS IO Unit Control Reply */ typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY @@ -274,3 +284,5 @@ SasIoUnitControlReply_t, MPI_POINTER pSasIoUnitControlReply_t; #endif + + ==== //depot/projects/uart/dev/mpt/mpilib/mpi_type.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.8 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.9 2006/02/25 07:45:54 mjacob Exp $ */ /* * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI Basic type definitions * Creation Date: June 6, 2000 * - * mpi_type.h Version: 01.05.01 + * mpi_type.h Version: 01.05.02 * * Version History * --------------- @@ -48,6 +48,7 @@ * 08-08-01 01.02.01 Original release for v1.2 work. * 05-11-04 01.03.01 Original release for MPI v1.3. * 08-19-04 01.05.01 Original release for MPI v1.5. + * 08-30-05 01.05.02 Added PowerPC option to #ifdef's. * -------------------------------------------------------------------------- */ @@ -71,12 +72,24 @@ * *****************************************************************************/ -typedef int8_t S8; -typedef uint8_t U8; -typedef int16_t S16; -typedef uint16_t U16; -typedef int32_t S32; -typedef uint32_t U32; +typedef signed char S8; +typedef unsigned char U8; +typedef signed short S16; +typedef unsigned short U16; + + +#if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc) + + typedef signed int S32; + typedef unsigned int U32; + +#else + + typedef signed long S32; + typedef unsigned long U32; + +#endif + typedef struct _S64 { ==== //depot/projects/uart/dev/mpt/mpt.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Generic routines for LSI '909 FC adapters. + * Generic routines for LSI Fusion adapters. * FreeBSD Version. * * Copyright (c) 2000, 2001 by Greg Ansley @@ -24,10 +24,41 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + */ +/*- + * Copyright (c) 2002, 2006 by Matthew Jacob + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon including + * a substantially similar Disclaimer requirement for further binary + * redistribution. + * 3. Neither the names of the above listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT + * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Additional Copyright (c) 2002 by Matthew Jacob under same license. + * Support from Chris Ellsworth in order to make SAS adapters work + * is gratefully acknowledged. */ -/* +/*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. * Copyright (c) 2005, WHEEL Sp. z o.o. * Copyright (c) 2004, 2005 Justin T. Gibbs @@ -61,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.15 2006/02/11 01:35:29 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.16 2006/02/25 07:45:54 mjacob Exp $"); #include #include /* XXX For static handler registration */ ==== //depot/projects/uart/dev/mpt/mpt.h#6 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 25 19:03:44 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 CCFD916A423; Sat, 25 Feb 2006 19:03:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8449C16A422 for ; Sat, 25 Feb 2006 19:03:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13CBE43D46 for ; Sat, 25 Feb 2006 19:03:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1PJ3gJa021138 for ; Sat, 25 Feb 2006 19:03:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1PJ3gJn021135 for perforce@freebsd.org; Sat, 25 Feb 2006 19:03:42 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Feb 2006 19:03:42 GMT Message-Id: <200602251903.k1PJ3gJn021135@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 92387 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: Sat, 25 Feb 2006 19:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92387 Change 92387 by marcel@marcel_nfs on 2006/02/25 19:03:20 Flesh out the interrupt handler setup code a bit more. scc(4) now sets up the interrupt handler after all children are attached. If any of the children has a MPSAFE handler (i.e. non-FAST), then scc(4) will be MPSAFE. Affected files ... .. //depot/projects/uart/dev/scc/scc_bfe.h#9 edit .. //depot/projects/uart/dev/scc/scc_core.c#10 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bfe.h#9 (text+ko) ==== @@ -70,6 +70,8 @@ int m_alloc_rres:1; int m_attached:1; int m_probed:1; + int m_hasintr:1; + int m_fastintr:1; driver_intr_t *ih; driver_intr_t *ih_overrun; ==== //depot/projects/uart/dev/scc/scc_core.c#10 (text+ko) ==== @@ -99,7 +99,7 @@ const char *sep; bus_space_handle_t bh; u_long base, size, start; - int c, error, mode, reset; + int c, error, intr, mode, reset; /* * The sc_class field defines the type of SCC we're going to work @@ -141,32 +141,6 @@ sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE | RF_SHAREABLE); - if (sc->sc_ires != NULL) { -#if 0 - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, - sc, &sc->sc_icookie); -#else - error = -1; -#endif - if (error) - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, - scc_bfe_intr, sc, &sc->sc_icookie); - else - sc->sc_fastintr = 1; - - if (error) { - device_printf(dev, "could not activate interrupt\n"); - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, - sc->sc_ires); - sc->sc_ires = NULL; - } - } - if (sc->sc_ires == NULL) { - /* XXX no interrupt resource. Force polled mode. */ - sc->sc_polled = 1; - } /* * Create the control structures for our children. Probe devices @@ -209,10 +183,10 @@ m->m_probed = 1; reset = (reset && SERDEV_RESET(m->m_dev)); } - } + } start += (cl->cl_range < 0) ? -size : size; - } + } /* * Have the hardware driver initialize the hardware. Tell it @@ -226,23 +200,12 @@ if (error) goto fail; - if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) { - sep = ""; - device_print_prettyname(dev); - if (sc->sc_fastintr) { - printf("%sfast interrupt", sep); - sep = ", "; - } - if (sc->sc_polled) { - printf("%spolled mode", sep); - sep = ", "; - } - printf("\n"); - } - /* * Attach all child devices that were probed successfully. + * Keep track of whether we can setup a fast interrupt + * handler ourselves. */ + intr = INTR_MPSAFE; for (c = 0; c < cl->cl_channels; c++) { ch = &sc->sc_chan[c]; for (mode = 0; mode < SCC_NMODES; mode++) { @@ -253,12 +216,51 @@ if (error) continue; m->m_attached = 1; - m->ih_break = SERDEV_IHAND(m->m_dev, SER_INT_BREAK); - m->ih_overrun = SERDEV_IHAND(m->m_dev, SER_INT_OVERRUN); - m->ih_rxready = SERDEV_IHAND(m->m_dev, SER_INT_RXREADY); - m->ih_sigchg = SERDEV_IHAND(m->m_dev, SER_INT_SIGCHG); - m->ih_txidle = SERDEV_IHAND(m->m_dev, SER_INT_TXIDLE); + if (m->m_hasintr && !m->m_fastintr) + intr = INTR_MPSAFE; + } + } + + /* + * Setup our interrupt handler. Make it FAST if all our + * children are fast as well. Otherwise make it MPSAFE. + */ + if (sc->sc_ires != NULL) { + error = BUS_SETUP_INTR(device_get_parent(dev), dev, + sc->sc_ires, INTR_TYPE_TTY | intr, scc_bfe_intr, + sc, &sc->sc_icookie); + if (error && intr == INTR_FAST) { + intr = INTR_MPSAFE; + error = BUS_SETUP_INTR(device_get_parent(dev), dev, + sc->sc_ires, INTR_TYPE_TTY | intr, scc_bfe_intr, + sc, &sc->sc_icookie); + } + if (error) { + device_printf(dev, "could not activate interrupt\n"); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, + sc->sc_ires); + sc->sc_ires = NULL; + } + else + sc->sc_fastintr = (intr == INTR_FAST) ? 1 : 0; + } + if (sc->sc_ires == NULL) { + /* XXX no interrupt resource. Force polled mode. */ + sc->sc_polled = 1; + } + + if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) { + sep = ""; + device_print_prettyname(dev); + if (sc->sc_fastintr) { + printf("%sfast interrupt", sep); + sep = ", "; + } + if (sc->sc_polled) { + printf("%spolled mode", sep); + sep = ", "; } + printf("\n"); } sc->sc_leaving = 0; @@ -349,14 +351,13 @@ struct scc_chan *ch; struct scc_mode *m; + if (device_get_parent(child) != dev) + return (NULL); + /* We only support default allocations. */ if (start != 0UL || end != ~0UL) return (NULL); - /* We don't support any grandchildren or children thereof. */ - if (device_get_parent(child) != dev) - return (NULL); - m = device_get_ivars(child); ch = m->m_chan; rle = resource_list_find(&ch->ch_rlist, type, 0); @@ -374,7 +375,6 @@ struct scc_chan *ch; struct scc_mode *m; - /* We don't support any grandchildren or children thereof. */ if (device_get_parent(child) != dev) return (EINVAL); @@ -399,6 +399,9 @@ struct scc_mode *m; struct scc_softc *sc; + if (device_get_parent(child) != dev) + return (EINVAL); + sc = device_get_softc(dev); cl = sc->sc_class; m = device_get_ivars(child); @@ -434,7 +437,6 @@ struct scc_chan *ch; struct scc_mode *m; - /* We don't support any grandchildren or children thereof. */ if (device_get_parent(child) != dev) return (EINVAL); @@ -450,13 +452,24 @@ { struct scc_mode *m; - /* We don't support any grandchildren or children thereof. */ if (device_get_parent(child) != dev) return (EINVAL); + /* Interrupt handlers must be FAST or MPSAFE. */ + if ((flags & (INTR_FAST|INTR_MPSAFE)) == 0) + return (EINVAL); + m = device_get_ivars(child); + m->m_hasintr = 1; + m->m_fastintr = (flags & INTR_FAST) ? 1 : 0; m->ih = ihand; m->ih_arg = arg; + + m->ih_break = SERDEV_IHAND(child, SER_INT_BREAK); + m->ih_overrun = SERDEV_IHAND(child, SER_INT_OVERRUN); + m->ih_rxready = SERDEV_IHAND(child, SER_INT_RXREADY); + m->ih_sigchg = SERDEV_IHAND(child, SER_INT_SIGCHG); + m->ih_txidle = SERDEV_IHAND(child, SER_INT_TXIDLE); return (0); } @@ -464,6 +477,23 @@ scc_bus_teardown_intr(device_t dev, device_t child, struct resource *r, void *cookie) { + struct scc_mode *m; - return (ENXIO); + if (device_get_parent(child) != dev) + return (EINVAL); + + m = device_get_ivars(child); + if (!m->m_hasintr) + return (EINVAL); + + m->m_hasintr = 0; + m->m_fastintr = 0; + m->ih = NULL; + m->ih_arg = NULL; + m->ih_break = NULL; + m->ih_overrun = NULL; + m->ih_rxready = NULL; + m->ih_sigchg = NULL; + m->ih_txidle = NULL; + return (0); } From owner-p4-projects@FreeBSD.ORG Sat Feb 25 20:47: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 CFF4016A423; Sat, 25 Feb 2006 20:47:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D26816A420 for ; Sat, 25 Feb 2006 20:47:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 555F743D46 for ; Sat, 25 Feb 2006 20:47:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1PKln6p033001 for ; Sat, 25 Feb 2006 20:47:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1PKlm4V032998 for perforce@freebsd.org; Sat, 25 Feb 2006 20:47:48 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Feb 2006 20:47:48 GMT Message-Id: <200602252047.k1PKlm4V032998@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 92390 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: Sat, 25 Feb 2006 20:47:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92390 Change 92390 by marcel@marcel_nfs on 2006/02/25 20:47:01 Slightly change the logic of scheduling the softih. Add a schedih flag to the softc that signals whether to schedule the softc. When scheduled, the flag is cleared. Softih handlers set the flag again to signal that they need to be rescheduled. This avoids that we're rescheduling the softih when not needed. Schedule the softih in the source-specific interrupt handlers. There's no need to schedule the softih at the end of the generic interrupt handler. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#39 edit .. //depot/projects/uart/dev/uart/uart_core.c#45 edit .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#7 edit .. //depot/projects/uart/dev/uart/uart_tty.c#25 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#39 (text+ko) ==== @@ -99,6 +99,7 @@ int sc_opened:1; /* This UART is open for business. */ int sc_polled:1; /* This UART has no interrupts. */ int sc_txbusy:1; /* This UART is transmitting. */ + int sc_schedih:1; /* The softih needs (re)scheduling. */ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ ==== //depot/projects/uart/dev/uart/uart_core.c#45 (text+ko) ==== @@ -71,6 +71,20 @@ } /* + * Schedule a soft interrupt. + */ +static __inline void +uart_sched_softih(struct uart_softc *sc, uint32_t ipend) +{ + + atomic_set_32(&sc->sc_ttypend, ipend); + if (sc->sc_schedih) { + swi_sched(sc->sc_softih, 0); + sc->sc_schedih = 0; + } +} + +/* * A break condition has been detected. We treat the break condition as * a special case that should not happen during normal operation. When * the break condition is to be passed to higher levels in the form of @@ -91,7 +105,7 @@ } #endif if (sc->sc_opened) - atomic_set_32(&sc->sc_ttypend, SER_INT_BREAK); + uart_sched_softih(sc, SER_INT_BREAK); } /* @@ -118,7 +132,7 @@ UART_RECEIVE(sc); if (uart_rx_put(sc, UART_STAT_OVERRUN)) sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; - atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); + uart_sched_softih(sc, SER_INT_RXREADY); } UART_FLUSH(sc, UART_FLUSH_RECEIVER); } @@ -145,7 +159,7 @@ } #endif if (sc->sc_opened) - atomic_set_32(&sc->sc_ttypend, SER_INT_RXREADY); + uart_sched_softih(sc, SER_INT_RXREADY); else sc->sc_rxput = sc->sc_rxget; /* Ignore received data. */ } @@ -184,8 +198,10 @@ old = sc->sc_ttypend; new = old & ~SER_MASK_STATE; new |= sig & SER_INT_SIGMASK; - new |= SER_INT_SIGCHG; } while (!atomic_cmpset_32(&sc->sc_ttypend, old, new)); + + if (sc->sc_opened) + uart_sched_softih(sc, SER_INT_SIGCHG); } /* @@ -198,7 +214,7 @@ if (sc->sc_txbusy) { sc->sc_txbusy = 0; - atomic_set_32(&sc->sc_ttypend, SER_INT_TXIDLE); + uart_sched_softih(sc, SER_INT_TXIDLE); } } @@ -220,9 +236,6 @@ if (ipend & SER_INT_TXIDLE) uart_intr_txidle(sc); } - - if (sc->sc_opened && sc->sc_ttypend != 0) - swi_sched(sc->sc_softih, 0); } driver_intr_t * ==== //depot/projects/uart/dev/uart/uart_kbd_sun.c#7 (text+ko) ==== @@ -258,6 +258,7 @@ &sunkbd_softc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); sc->sc_opened = 1; + sc->sc_schedih = 1; KBD_INIT_DONE(&sunkbd_softc.sc_kbd); } @@ -273,6 +274,7 @@ if (sc->sc_uart->sc_leaving) return; + sc->sc_uart->sc_schedih = 1; pend = atomic_readandclear_32(&sc->sc_uart->sc_ttypend); if (!(pend & SER_INT_MASK)) return; ==== //depot/projects/uart/dev/uart/uart_tty.c#25 (text+ko) ==== @@ -306,6 +306,7 @@ if (sc->sc_leaving) return; + sc->sc_schedih = 1; pend = atomic_readandclear_32(&sc->sc_ttypend); if (!(pend & SER_INT_MASK)) return; @@ -379,6 +380,7 @@ swi_add(&tty_intr_event, uart_driver_name, uart_tty_intr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); + sc->sc_schedih = 1; ttycreate(tp, TS_CALLOUT, "u%r", unit);