From owner-p4-projects@FreeBSD.ORG Sun Mar 14 00:15:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9F8116A4D0; Sun, 14 Mar 2004 00:15:00 -0800 (PST) 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 8D62D16A4CE for ; Sun, 14 Mar 2004 00:15:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8163943D3F for ; Sun, 14 Mar 2004 00:15:00 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E8F0Ge030763 for ; Sun, 14 Mar 2004 00:15:00 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E8F079030752 for perforce@freebsd.org; Sun, 14 Mar 2004 00:15:00 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 14 Mar 2004 00:15:00 -0800 (PST) Message-Id: <200403140815.i2E8F079030752@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 Subject: PERFORCE change 48960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2004 08:15:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=48960 Change 48960 by marcel@marcel_nfs on 2004/03/14 00:14:43 The beginnings of a new gdb backend. The meat is machine independent and shared by all platforms. The machine dependent bits mostly relate to registers and will have the necessary callbacks. The backend will support threads if all goes well. That way one can easily list all kernel threads in gdb and print backtraces and dump registers for them. While on the subject, implement support for a debug port on sparc64. Since there's no facility for specifying a debug port in the OF, we need to use environment variables. On sparc64, one needs to set debug_port to some OF device name or predefined alias (e.g set debug_port=ttyb). Affected files ... .. //depot/projects/gdb/sys/conf/files#7 edit .. //depot/projects/gdb/sys/conf/files.i386#5 edit .. //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#2 edit .. //depot/projects/gdb/sys/gdb/gdb.h#4 edit .. //depot/projects/gdb/sys/gdb/gdb_int.h#1 add .. //depot/projects/gdb/sys/gdb/gdb_main.c#3 edit .. //depot/projects/gdb/sys/gdb/gdb_packet.c#1 add .. //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#1 add .. //depot/projects/gdb/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/gdb/sys/i386/include/gdb_machdep.h#1 add Differences ... ==== //depot/projects/gdb/sys/conf/files#7 (text+ko) ==== @@ -956,7 +956,8 @@ fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs -gdb/gdb_main.c optional gdb +gdb/gdb_main.c optional gdb +gdb/gdb_packet.c optional gdb geom/bde/g_bde.c optional geom_bde geom/bde/g_bde_crypt.c optional geom_bde geom/bde/g_bde_lock.c optional geom_bde ==== //depot/projects/gdb/sys/conf/files.i386#5 (text+ko) ==== @@ -204,8 +204,8 @@ i386/i386/elan-mmcr.c optional cpu_soekris i386/i386/elf_machdep.c standard i386/i386/exception.s standard +i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode -i386/i386/i386-gdbstub.c optional gdb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#2 (text+ko) ==== @@ -39,8 +39,6 @@ #include #include -static phandle_t uart_cpu_getdev_keyboard(phandle_t root); - static struct bus_space_tag bst_store[3]; static int @@ -67,21 +65,83 @@ return ((b1->bsh == b2->bsh) ? 1 : 0); } +/* + * Get the address of the UART that is selected as the console, if the + * console is an UART of course. Note that we enforce that both stdin and + * stdout are selected. For weird configurations, use ofw_console(4). + * Note that the currently active console (i.e. /chosen/stdout and + * /chosen/stdin) may not be the same as the device selected in the + * environment (ie /options/output-device and /options/input-device) because + * the user may have changed the environment. In that case I would assume + * that the user expects that FreeBSD uses the new console setting. There's + * no choice, really. + */ static phandle_t -uart_cpu_getdev_keyboard(phandle_t root) +uart_cpu_getdev_console(phandle_t options, char *dev, size_t devsz) +{ + char buf[32]; + phandle_t input; + + if (OF_getprop(options, "input-device", dev, devsz) == -1) + return (-1); + if ((input = OF_finddevice(dev)) == -1) + return (-1); + if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1) + return (-1); + if (strcmp(buf, "serial") != 0) + return (-1); + if (OF_getprop(options, "output-device", buf, sizeof(buf)) == -1) + return (-1); + if (OF_finddevice(buf) != input) + return (-1); + return (input); +} + +/* + * Get the address of the UART that's selected as the debug port. Since + * there's no place for this in the OF, we use the kernel environment. + * The environment variable is "debug_port" and its value is the device + * name (or an alias) known by the OF. + */ +static phandle_t +uart_cpu_getdev_dbgport(phandle_t options, char *dev, size_t devsz) +{ + char buf[32]; + phandle_t input; + + if (!getenv_string("debug_port", dev, devsz)) + return (-1); + if ((input = OF_finddevice(dev)) == -1) + return (-1); + if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1) + return (-1); + if (strcmp(buf, "serial") != 0) + return (-1); + /* Rudimentary sanity check: the debug port cannot be the console. */ + if (OF_getprop(options, "input-device", buf, sizeof(buf)) == -1) + return (-1); + if (OF_finddevice(buf) == input) + return (-1); + return (input); +} + +static phandle_t +uart_cpu_getdev_keyboard(phandle_t root, char *dev, size_t devsz) { - phandle_t child; - phandle_t node; char buf[32]; + phandle_t child, node; - for (child = OF_child(root); child != 0 && child != -1; - child = OF_peer(child)) { + child = OF_child(root); + while (child != 0 && child != -1) { if (OF_getprop(child, "device_type", buf, sizeof(buf)) != -1 && !strcmp(buf, "serial") && - OF_getprop(child, "keyboard", buf, sizeof(buf)) != -1) + OF_getprop(child, "keyboard", buf, sizeof(buf)) != -1) { + OF_getprop(child, "name", dev, devsz); return (child); - if ((node = uart_cpu_getdev_keyboard(child)) != -1) + } + if ((node = uart_cpu_getdev_keyboard(child, dev, devsz)) != -1) return (node); + child = OF_peer(child); } return (-1); } @@ -90,47 +150,29 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) { char buf[32], dev[32], compat[32]; - phandle_t input, options, output; + phandle_t input, options; bus_addr_t addr; int baud, bits, error, space, stop; char flag, par; - /* - * Get the address of the UART that is selected as the console, if - * the console is an UART of course. Note that we enforce that both - * stdin and stdout are selected. For weird configurations, use - * ofw_console(4). - * Note that the currently active console (ie /chosen/stdout and - * /chosen/stdin) may not be the same as the device selected in the - * environment (ie /options/output-device and /options/input-device) - * because the user may have changed the environment. In that case - * I would assume that the user expects that FreeBSD uses the new - * console setting. There's choice choice, really. - */ - if ((options = OF_finddevice("/options")) == -1) - return (ENXIO); - if (devtype == UART_DEV_CONSOLE) { - if (OF_getprop(options, "input-device", dev, sizeof(dev)) == -1) - return (ENXIO); - if ((input = OF_finddevice(dev)) == -1) - return (ENXIO); - if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1) - return (ENXIO); - if (strcmp(buf, "serial")) - return (ENODEV); - if (OF_getprop(options, "output-device", buf, sizeof(buf)) - == -1) - return (ENXIO); - if ((output = OF_finddevice(buf)) == -1) - return (ENXIO); - if (input != output) - return (ENXIO); - } else if (devtype == UART_DEV_KEYBOARD) { - if ((input = uart_cpu_getdev_keyboard(OF_peer(0))) == -1) - return (ENXIO); - } else - return (ENODEV); - + if ((options = OF_finddevice("/options")) == -1) + return (ENXIO); + switch (devtype) { + case UART_DEV_CONSOLE: + input = uart_cpu_getdev_console(options, dev, sizeof(dev)); + break; + case UART_DEV_DBGPORT: + input = uart_cpu_getdev_dbgport(options, dev, sizeof(dev)); + break; + case UART_DEV_KEYBOARD: + input = uart_cpu_getdev_keyboard(OF_peer(0), dev, sizeof(dev)); + break; + default: + input = -1; + break; + } + if (input == -1) + return (ENXIO); error = OF_decode_addr(input, &space, &addr); if (error) return (error); ==== //depot/projects/gdb/sys/gdb/gdb.h#4 (text+ko) ==== @@ -59,6 +59,10 @@ }; \ DATA_SET(gdb_dbgport_set, name##_gdb_dbgport) -extern struct gdb_dbgport *gdb_cur; +struct trapframe; + +int gdb_cpu_regsz(int); +uintmax_t gdb_cpu_regval(int, struct trapframe *); +int gdb_cpu_signal(int, int); #endif /* !_GDB_GDB_H_ */ ==== //depot/projects/gdb/sys/gdb/gdb_main.c#3 (text+ko) ==== @@ -31,8 +31,12 @@ #include #include #include +#include + +#include #include +#include static dbbe_init_f gdb_init; static dbbe_trap_f gdb_trap; @@ -42,7 +46,7 @@ GDB_DBGPORT(null, NULL, NULL, NULL, NULL, NULL, NULL); SET_DECLARE(gdb_dbgport_set, struct gdb_dbgport); -static struct gdb_dbgport *gdb_cur = NULL; +struct gdb_dbgport *gdb_cur = NULL; static int gdb_init(void) @@ -81,5 +85,30 @@ static int gdb_trap(int type, int code, struct trapframe *tf) { + const char *p; + + /* + * Send a T packet. We currently do not support watchpoints (the + * awatch, rwatch or watch elements). + */ + gdb_tx_begin('T'); + gdb_tx_hex(gdb_cpu_signal(type, code), 2); + gdb_tx_reg(GDB_REG_PC, tf); + gdb_tx_char(';'); + gdb_tx_reg(GDB_REG_FP, tf); + gdb_tx_char(';'); + gdb_tx_reg(GDB_REG_SP, tf); + gdb_tx_char(';'); + gdb_tx_str("thread:"); + gdb_tx_varhex((uintptr_t)curthread); + gdb_tx_end(); /* XXX check error condition. */ + + while (gdb_rx_begin() == 0) { + p = gdb_rxp; + switch (gdb_rx_char()) { + case 'c': /* continue */ + return (1); + } + } return (0); } From owner-p4-projects@FreeBSD.ORG Sun Mar 14 00:32:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0069416A4D0; Sun, 14 Mar 2004 00:32:22 -0800 (PST) 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 B622416A4CE for ; Sun, 14 Mar 2004 00:32:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A911043D3F for ; Sun, 14 Mar 2004 00:32:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E8WMGe034718 for ; Sun, 14 Mar 2004 00:32:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E8WLHC034715 for perforce@freebsd.org; Sun, 14 Mar 2004 00:32:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Mar 2004 00:32:21 -0800 (PST) Message-Id: <200403140832.i2E8WLHC034715@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 Subject: PERFORCE change 48961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2004 08:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48961 Change 48961 by rwatson@rwatson_paprika on 2004/03/14 00:32:04 Integrate netperf_socket: - More 0/NULL fixes. - i386/isa/istallion removed. - i386/isa/stallion removed. - Ethernet attachment now prints ethernt address, so drivers don't have to. Affected files ... .. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#4 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#10 integrate .. //depot/projects/netperf_socket/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/cdk.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/wtio.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/README.stl#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_le.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/istallion.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/stallion.c#3 delete .. //depot/projects/netperf_socket/sys/kern/subr_param.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#3 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.28 2003/08/25 23:28:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.29 2004/03/14 05:48:04 bde Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -112,7 +112,7 @@ /* * Special handling for PXE and CD booting. */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { /* * We only want the PXE disk to try to init itself in the below * walk through devsw if we actually booted off of PXE. @@ -177,7 +177,7 @@ new_currdev.d_dev = &biosdisk; /* new-style boot loaders such as pxeldr and cdldr */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { if ((kargs->bootflags & KARGS_FLAGS_CD) != 0) { /* we are booting from a CD with cdboot */ new_currdev.d_dev = &bioscd; ==== //depot/projects/netperf_socket/sys/conf/files.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.472 2004/03/14 05:31:40 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.473 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,6 @@ i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." i386/isa/isa_dma.c optional isa -i386/isa/istallion.c optional stli nowerror i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx @@ -288,7 +287,6 @@ i386/isa/spic.c optional spic i386/isa/spigot.c count spigot i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux ==== //depot/projects/netperf_socket/sys/conf/files.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.288 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -205,12 +205,10 @@ i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." -i386/isa/istallion.c optional stli nowerror i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/netperf_socket/sys/dev/an/if_an.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.58 2004/01/10 03:02:04 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.59 2004/03/14 07:12:19 mdodd Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -749,9 +749,6 @@ bcopy((char *)&sc->an_caps.an_oemaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - printf("an%d: Ethernet address: %6D\n", sc->an_unit, - sc->arpcom.ac_enaddr, ":"); - ifp->if_softc = sc; sc->an_unit = unit; if_initname(ifp, device_get_name(sc->an_dev), ==== //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.6 2004/03/02 05:43:42 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.7 2004/03/14 07:12:20 mdodd Exp $"); #include #include @@ -406,9 +406,6 @@ bfe_get_config(sc); - printf("bfe%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Reset the chip and turn on the PHY */ bfe_chip_reset(sc); ==== //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.63 2004/01/13 11:31:09 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.64 2004/03/14 07:12:20 mdodd Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2309,12 +2309,6 @@ goto fail; } - /* - * A Broadcom chip was detected. Inform the world. - */ - printf("bge%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Save ASIC rev. */ sc->bge_chipid = ==== //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.13 2003/10/31 18:31:58 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.14 2004/03/14 07:12:20 mdodd Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -1628,8 +1628,6 @@ bus_space_read_1(sc->sc_memt, sc->sc_memh, sc->sc_memoff + CNW_EREG_PA + i); } - device_printf(dev, "Ethernet address: %6D\n", - sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ==== //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.28 2003/11/04 02:59:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.29 2004/03/14 07:12:20 mdodd Exp $"); /* * @@ -686,10 +686,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - if (bootverbose) - if_printf(ifp, "ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return (0); } ==== //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.226 2004/03/03 07:33:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.227 2004/03/14 07:12:20 mdodd Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -1758,11 +1758,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - /* - * Print additional info when attached - */ - if_printf(ifp, "address %6D, ", sc->arpcom.ac_enaddr, ":"); - if (sc->type_str && (*sc->type_str != 0)) printf("type %s ", sc->type_str); else ==== //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); #include #include @@ -287,9 +287,6 @@ for (i = 0; i < 3; i++) CSR_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ifp = &sc->arpcom.ac_if; attached = (ifp->if_softc != 0); ==== //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.47 2003/10/31 18:32:00 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.48 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver @@ -271,9 +271,6 @@ */ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return(0); } ==== //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.80 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.81 2004/03/14 07:12:21 mdodd Exp $"); /* * @@ -821,8 +821,7 @@ fe_stop(sc); /* Print additional info when attached. */ - device_printf(dev, "address %6D, type %s%s\n", - sc->sc_enaddr, ":" , sc->typestr, + device_printf(dev, "type %s%s\n", sc->typestr, (sc->proto_dlcr4 & FE_D4_DSC) ? ", full duplex" : ""); if (bootverbose) { int buf, txb, bbw, sbw, ram; ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#2 (text+ko) ==== @@ -28,14 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); #include #include @@ -758,9 +758,6 @@ sc->arpcom.ac_enaddr[3] = myea[1] >> 8; sc->arpcom.ac_enaddr[4] = myea[2] & 0xff; sc->arpcom.ac_enaddr[5] = myea[2] >> 8; - device_printf(dev, "Ethernet address %6D%s\n", - sc->arpcom.ac_enaddr, ":", - sc->flags & FXP_FLAG_SERIAL_MEDIA ? ", 10Mbps" : ""); if (bootverbose) { device_printf(dev, "PCI IDs: %04x %04x %04x %04x %04x\n", pci_get_vendor(dev), pci_get_device(dev), ==== //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.14 2004/01/18 10:15:48 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.15 2004/03/14 07:12:21 mdodd Exp $"); #include #include @@ -320,8 +320,6 @@ error = ENXIO; goto fail; } - device_printf(dev, "Ethernet address: %6D\n", - gx->arpcom.ac_enaddr, ":"); /* Allocate the ring buffers. */ gx->gx_rdata = contigmalloc(sizeof(struct gx_ring_data), M_DEVBUF, ==== //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.97 2003/10/31 18:32:02 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.98 2004/03/14 07:12:22 mdodd Exp $"); /* * Intel 82586 Ethernet chip @@ -319,9 +319,6 @@ EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, sc, SHUTDOWN_PRI_DEFAULT); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ether_ifattach(ifp, sc->arpcom.ac_enaddr); return (0); } ==== //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.27 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.28 2004/03/14 07:12:22 mdodd Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -572,11 +572,6 @@ lge_read_eeprom(sc, (caddr_t)&eaddr[2], LGE_EE_NODEADDR_1, 1, 0); lge_read_eeprom(sc, (caddr_t)&eaddr[4], LGE_EE_NODEADDR_2, 1, 0); - /* - * A Level 1 chip was detected. Inform the world. - */ - printf("lge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->lge_unit = unit; callout_handle_init(&sc->lge_stat_ch); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.104 2004/03/03 08:33:34 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.105 2004/03/14 07:12:22 mdodd Exp $"); /* #define DIAGNOSTIC @@ -894,13 +894,11 @@ ether_ifattach(&sc->arpcom.ac_if, sc->arpcom.ac_enaddr); - printf("%s: ", sc->arpcom.ac_if.if_xname); if (sc->nic.ic == LANCE || sc->nic.ic == C_LANCE) - printf("%s (%s)", + if_printf(&sc->arpcom.ac_if, "%s (%s)\n", nic_ident[sc->nic.ident], ic_ident[sc->nic.ic]); else - printf("%s", ic_ident[sc->nic.ic]); - printf(" address %6D\n", sc->arpcom.ac_enaddr, ":"); + if_printf(&sc->arpcom.ac_if, "%s\n", ic_ident[sc->nic.ic]); return (1); } ==== //depot/projects/netperf_socket/sys/dev/my/if_my.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.22 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.23 2004/03/14 07:12:22 mdodd Exp $"); #include #include @@ -961,11 +961,6 @@ for (i = 0; i < ETHER_ADDR_LEN; ++i) eaddr[i] = CSR_READ_1(sc, MY_PAR0 + i); - /* - * A Myson chip was detected. Inform the world. - */ - printf("my%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->my_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.52 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.53 2004/03/14 07:12:22 mdodd Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -906,11 +906,6 @@ nge_read_eeprom(sc, (caddr_t)&eaddr[2], NGE_EE_NODEADDR + 1, 1, 0); nge_read_eeprom(sc, (caddr_t)&eaddr[0], NGE_EE_NODEADDR + 2, 1, 0); - /* - * A NatSemi chip was detected. Inform the world. - */ - printf("nge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->nge_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#2 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.4 2003/12/10 15:09:38 bms Exp $"; + "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.5 2004/03/14 07:12:22 mdodd Exp $"; #endif static void wi_intr(void *); @@ -226,8 +226,6 @@ bcopy((char *)&mac.wi_mac_addr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - device_printf(dev, "802.11 address: %6D\n", sc->arpcom.ac_enaddr, ":"); - owi_get_id(sc); if_initname(ifp, device_get_name(dev), sc->wi_unit); ==== //depot/projects/netperf_socket/sys/dev/re/if_re.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.17 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.18 2004/03/14 07:12:22 mdodd Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1212,11 +1212,6 @@ } } - /* - * A RealTek chip was detected. Inform the world. - */ - printf("re%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.14 2003/10/31 18:32:04 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.15 2004/03/14 07:12:23 mdodd Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -245,8 +245,7 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - if_printf(ifp, "speed %ld, address %6D, rxl ", - ifp->if_baudrate, sc->arpcom.ac_enaddr, ":"); + if_printf(ifp, "speed %ld, rxl ", ifp->if_baudrate); if (sc->delta_rxl) printf("auto\n"); else ==== //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.35 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.36 2004/03/14 07:12:23 mdodd Exp $"); /* * This is a driver for SMC's 9000 series of Ethernet adapters. @@ -201,7 +201,6 @@ p[i + 1] = address >> 8; p[i] = address & 0xFF; } - printf(" MAC address %6D\n", sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ==== //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.12 2003/11/01 23:24:38 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.13 2004/03/14 07:12:23 mdodd Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -162,7 +162,6 @@ camdump(sc); } #endif - device_printf(sc->sc_dev, "address %6D\n", myea, ":"); #ifdef SNCDEBUG device_printf(sc->sc_dev, ==== //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.80 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.81 2004/03/14 07:12:23 mdodd Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -391,9 +391,6 @@ goto fail; } - /* Display ethernet address ,... */ - device_printf(dev, "address %6D,", sc->sc_macaddr, ":"); - /* board type and ... */ printf(" type "); for(i = 0x2c; i < 0x32; i++) { ==== //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#2 (text+ko) ==== @@ -35,14 +35,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); /* * Driver for 3c990 (Typhoon) Ethernet ASIC */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); #include #include @@ -93,7 +93,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"; #endif /* @@ -334,9 +334,6 @@ sc->sc_arpcom.ac_enaddr[4] = ((u_int8_t *)&p2)[1]; sc->sc_arpcom.ac_enaddr[5] = ((u_int8_t *)&p2)[0]; - printf("txp%d: Ethernet address %6D\n", unit, - sc->sc_arpcom.ac_enaddr, ":"); - sc->sc_cold = 0; ifmedia_init(&sc->sc_ifmedia, 0, txp_ifmedia_upd, txp_ifmedia_sts); ==== //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.79 2004/03/14 07:12:23 mdodd Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -730,11 +730,6 @@ */ aue_read_eeprom(sc, (caddr_t)&eaddr, 0, 3, 0); - /* - * A Pegasus chip was detected. Inform the world. - */ - printf("aue%d: Ethernet address: %6D\n", sc->aue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.11 2004/03/14 07:12:23 mdodd Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -492,11 +492,6 @@ */ sc->axe_phyaddrs[0] = sc->axe_phyaddrs[1] = 0xFF; - /* - * An ASIX chip was detected. Inform the world. - */ - printf("axe%d: Ethernet address: %6D\n", sc->axe_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.46 2004/03/14 07:12:23 mdodd Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -510,11 +510,6 @@ */ cue_getmac(sc, &eaddr); - /* - * A CATC chip was detected. Inform the world. - */ - printf("cue%d: Ethernet address: %6D\n", sc->cue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.52 2003/11/14 11:09:45 johan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.53 2004/03/14 07:12:23 mdodd Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -475,12 +475,6 @@ sc->kue_mcfilters = malloc(KUE_MCFILTCNT(sc) * ETHER_ADDR_LEN, M_USBDEV, M_NOWAIT); - /* - * A KLSI chip was detected. Inform the world. - */ - printf("kue%d: Ethernet address: %6D\n", sc->kue_unit, - sc->kue_desc.kue_macaddr, ":"); - bcopy(sc->kue_desc.kue_macaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.8 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.9 2004/03/14 07:12:23 mdodd Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -682,9 +682,6 @@ goto error1; } - /* RealTek RTL8150 was detected */ - printf("rue%d: Ethernet address: %6D\n", sc->rue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.48 2003/10/31 18:32:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.49 2004/03/14 07:12:24 mdodd Exp $"); /* * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support @@ -155,8 +155,6 @@ sc->arpcom.ac_enaddr[(i << 1) + 1] = x; } - printf(" address %6D\n", sc->arpcom.ac_enaddr, ":"); - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ==== //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#2 (text+ko) ==== @@ -173,7 +173,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.57 2003/11/14 19:00:31 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.58 2004/03/14 07:12:24 mdodd Exp $"); /* @@ -569,8 +569,7 @@ ether_ifattach(ifp, &sc->wl_addr[0]); bcopy(&sc->wl_addr[0], sc->wl_ac.ac_enaddr, WAVELAN_ADDR_SIZE); - printf("%s: address %6D, NWID 0x%02x%02x", ifp->if_xname, - sc->wl_ac.ac_enaddr, ":", sc->nwid[0], sc->nwid[1]); + if_printf(ifp, "NWID 0x%02x%02x", sc->nwid[0], sc->nwid[1]); if (sc->freq24) printf(", Freq %d MHz",sc->freq24); /* 2.4 Gz */ printf("\n"); /* 2.4 Gz */ ==== //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.46 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.47 2004/03/14 07:12:24 mdodd Exp $"); /* * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters. The @@ -297,7 +297,6 @@ XE_SELECT_PAGE(0x45); DEVPRINTF(1, (dev, "CE2 version = 0x%#02x\n", XE_INB(XE_REV))); } - device_printf(dev, "Ethernet address %6D\n", scp->arpcom.ac_enaddr, ":"); /* Attach the interface */ ether_ifattach(scp->ifp, scp->arpcom.ac_enaddr); ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#10 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1140 2004/03/14 05:31:40 imp Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1141 2004/03/14 06:48:34 imp Exp $ # # @@ -637,8 +637,6 @@ # digi: Digiboard driver # gsc: Genius GS-4500 hand scanner. # spic: Sony Programmable I/O controller (VAIO notebooks) -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on APM # The flags takes the following meaning for apm0: @@ -673,21 +671,6 @@ # is the only thing truly supported, but apparently a fair percentage # of the Vaio extra features are controlled by this device. -# Notes on the Stallion stl and stli drivers: -# See src/i386/isa/README.stl for complete instructions. -# This is version 0.0.5alpha, unsupported by Stallion. -# The stl driver has a secondary IO port hard coded at 0x280. You need -# to change src/i386/isa/stallion.c if you reconfigure this on the boards. -# The "flags" and "msize" settings on the stli driver depend on the board: -# EasyConnection 8/64 ISA: flags 23 msize 0x1000 -# EasyConnection 8/64 EISA: flags 24 msize 0x10000 -# EasyConnection 8/64 MCA: flags 25 msize 0x1000 -# ONboard ISA: flags 4 msize 0x10000 -# ONboard EISA: flags 7 msize 0x10000 -# ONboard MCA: flags 3 msize 0x10000 -# Brumby: flags 2 msize 0x4000 -# Stallion: flags 1 msize 0x10000 - device spigot 1 hint.spigot.0.at="isa" hint.spigot.0.port="0xad6" @@ -721,16 +704,6 @@ device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" -device stl -hint.stl.0.at="isa" -hint.stl.0.port="0x2a0" -hint.stl.0.irq="10" -device stli -hint.stli.0.at="isa" -hint.stli.0.port="0x2a0" -hint.stli.0.maddr="0xcc000" -hint.stli.0.flags="23" -hint.stli.0.msize="0x1000" # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu ==== //depot/projects/netperf_socket/sys/i386/isa/if_el.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.61 2003/10/31 18:32:07 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.62 2004/03/14 07:12:24 mdodd Exp $"); /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -277,10 +277,6 @@ dprintf(("Attaching interface...\n")); ether_ifattach(ifp, sc->arpcom.ac_enaddr); - /* Print out some information for the user */ - device_printf(dev, "3c501 address %6D\n", - sc->arpcom.ac_enaddr, ":"); - dprintf(("el_attach() finished.\n")); return(0); } ==== //depot/projects/netperf_socket/sys/i386/isa/if_le.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/if_le.c,v 1.77 2003/11/04 14:02:12 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/if_le.c,v 1.78 2004/03/14 07:12:24 mdodd Exp $"); /* * DEC EtherWORKS 2 Ethernet Controllers @@ -352,10 +352,6 @@ ifp->if_init = sc->if_init; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - if_printf(ifp, "%s ethernet address %6D\n", - sc->le_prodname, - sc->le_ac.ac_enaddr, ":"); - ether_ifattach(ifp, sc->le_ac.ac_enaddr); return 1; ==== //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 14 10:28:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD38316A4D0; Sun, 14 Mar 2004 10:28:27 -0800 (PST) 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 B3C3416A4CE for ; Sun, 14 Mar 2004 10:28:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9576F43D3F for ; Sun, 14 Mar 2004 10:28:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2EISRGe084072 for ; Sun, 14 Mar 2004 10:28:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2EISRcu084069 for perforce@freebsd.org; Sun, 14 Mar 2004 10:28:27 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 14 Mar 2004 10:28:27 -0800 (PST) Message-Id: <200403141828.i2EISRcu084069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 48975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2004 18:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=48975 Change 48975 by peter@peter_overcee on 2004/03/14 10:28:18 create a seperate loader for .o files Affected files ... .. //depot/projects/hammer/sys/kern/link_elf_obj.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 14 10:49:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 555CB16A4D0; Sun, 14 Mar 2004 10:49:54 -0800 (PST) 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 12FC516A4CE for ; Sun, 14 Mar 2004 10:49:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0362543D1D for ; Sun, 14 Mar 2004 10:49:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2EInrGe088122 for ; Sun, 14 Mar 2004 10:49:53 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2EInraP088119 for perforce@freebsd.org; Sun, 14 Mar 2004 10:49:53 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 14 Mar 2004 10:49:53 -0800 (PST) Message-Id: <200403141849.i2EInraP088119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 48976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2004 18:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=48976 Change 48976 by peter@peter_overcee on 2004/03/14 10:49:23 cut out preload support for the time being and do a step 0 pass at converting this from a .so to a .o loader. It isn't as hard as it looked. Affected files ... .. //depot/projects/hammer/sys/kern/link_elf_obj.c#2 edit Differences ... ==== //depot/projects/hammer/sys/kern/link_elf_obj.c#2 (text+ko) ==== @@ -44,9 +44,6 @@ #include #include -#ifdef GPROF -#include -#endif #include #include @@ -64,21 +61,13 @@ typedef struct elf_file { struct linker_file lf; /* Common fields */ - int preloaded; /* Was file pre-loaded */ caddr_t address; /* Relocation address */ #ifdef SPARSE_MAPPING vm_object_t object; /* VM object to hold file pages */ #endif - Elf_Dyn* dynamic; /* Symbol table etc. */ - Elf_Hashelt nbuckets; /* DT_HASH info */ - Elf_Hashelt nchains; - const Elf_Hashelt* buckets; - const Elf_Hashelt* chains; - caddr_t hash; caddr_t strtab; /* DT_STRTAB */ int strsz; /* DT_STRSZ */ const Elf_Sym* symtab; /* DT_SYMTAB */ - Elf_Addr* got; /* DT_PLTGOT */ const Elf_Rel* pltrel; /* DT_JMPREL */ int pltrelsize; /* DT_PLTRELSZ */ const Elf_Rela* pltrela; /* DT_JMPREL */ @@ -94,9 +83,6 @@ long ddbstrcnt; /* number of bytes in string table */ caddr_t symbase; /* malloc'ed symbold base */ caddr_t strbase; /* malloc'ed string base */ -#ifdef DDB - struct link_map gdb; /* hooks for gdb */ -#endif } *elf_file_t; static int link_elf_link_common_finish(linker_file_t); @@ -111,7 +97,6 @@ c_linker_sym_t* sym, long* diffp); static void link_elf_unload_file(linker_file_t); -static void link_elf_unload_preload(linker_file_t); static int link_elf_lookup_set(linker_file_t, const char *, void ***, void ***, int *); static int link_elf_each_function_name(linker_file_t, @@ -141,73 +126,7 @@ link_elf_methods, sizeof(struct elf_file) }; -static int parse_dynamic(elf_file_t ef); static int relocate_file(elf_file_t ef); -static int link_elf_preload_parse_symbols(elf_file_t ef); - -#ifdef DDB -static void r_debug_state(struct r_debug *dummy_one, - struct link_map *dummy_two); - -/* - * A list of loaded modules for GDB to use for loading symbols. - */ -struct r_debug r_debug; - -#define GDB_STATE(s) r_debug.r_state = s; r_debug_state(NULL, NULL); - -/* - * Function for the debugger to set a breakpoint on to gain control. - */ -static void -r_debug_state(struct r_debug *dummy_one __unused, - struct link_map *dummy_two __unused) -{ -} - -static void -link_elf_add_gdb(struct link_map *l) -{ - struct link_map *prev; - - l->l_next = NULL; - - if (r_debug.r_map == NULL) { - /* Add first. */ - l->l_prev = NULL; - r_debug.r_map = l; - } else { - /* Append to list. */ - for (prev = r_debug.r_map; prev->l_next != NULL; prev = prev->l_next) - ; - l->l_prev = prev; - prev->l_next = l; - } -} - -static void -link_elf_delete_gdb(struct link_map *l) -{ - if (l->l_prev == NULL) { - /* Remove first. */ - if ((r_debug.r_map = l->l_next) != NULL) - l->l_next->l_prev = NULL; - } else { - /* Remove any but first. */ - if ((l->l_prev->l_next = l->l_next) != NULL) - l->l_next->l_prev = l->l_prev; - } -} -#endif /* DDB */ - -#ifdef __ia64__ -Elf_Addr link_elf_get_gp(linker_file_t); -#endif - -/* - * The kernel symbol table starts here. - */ -extern struct _dynamic _DYNAMIC; static void link_elf_error(const char *s) @@ -217,15 +136,11 @@ /* * Actions performed after linking/loading both the preloaded kernel and any - * modules; whether preloaded or dynamicly loaded. + * modules; */ static int link_elf_link_common_finish(linker_file_t lf) { -#ifdef DDB - elf_file_t ef = (elf_file_t)lf; - char *newfilename; -#endif int error; /* Notify MD code that a module is being loaded. */ @@ -233,295 +148,29 @@ if (error) return (error); -#ifdef DDB - GDB_STATE(RT_ADD); - ef->gdb.l_addr = lf->address; - newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK); - strcpy(newfilename, lf->filename); - ef->gdb.l_name = newfilename; - ef->gdb.l_ld = ef->dynamic; - link_elf_add_gdb(&ef->gdb); - GDB_STATE(RT_CONSISTENT); -#endif - return (0); } static void link_elf_init(void* arg) { - Elf_Dyn *dp; - caddr_t modptr, baseptr, sizeptr; - elf_file_t ef; - char *modname; - linker_add_class(&link_elf_class); - - dp = (Elf_Dyn*) &_DYNAMIC; - modname = NULL; - modptr = preload_search_by_type("elf" __XSTRING(__ELF_WORD_SIZE) " kernel"); - if (modptr == NULL) - modptr = preload_search_by_type("elf kernel"); - if (modptr) - modname = (char *)preload_search_info(modptr, MODINFO_NAME); - if (modname == NULL) - modname = "kernel"; - linker_kernel_file = linker_make_file(modname, &link_elf_class); - if (linker_kernel_file == NULL) - panic("link_elf_init: Can't create linker structures for kernel"); - - ef = (elf_file_t) linker_kernel_file; - ef->preloaded = 1; - ef->address = 0; -#ifdef SPARSE_MAPPING - ef->object = 0; -#endif - ef->dynamic = dp; - - if (dp) - parse_dynamic(ef); - linker_kernel_file->address = (caddr_t) KERNBASE; - linker_kernel_file->size = -(intptr_t)linker_kernel_file->address; - - if (modptr) { - ef->modptr = modptr; - baseptr = preload_search_info(modptr, MODINFO_ADDR); - if (baseptr) - linker_kernel_file->address = *(caddr_t *)baseptr; - sizeptr = preload_search_info(modptr, MODINFO_SIZE); - if (sizeptr) - linker_kernel_file->size = *(size_t *)sizeptr; - } - (void)link_elf_preload_parse_symbols(ef); - -#ifdef DDB - r_debug.r_map = NULL; - r_debug.r_brk = r_debug_state; - r_debug.r_state = RT_CONSISTENT; -#endif - - (void)link_elf_link_common_finish(linker_kernel_file); + linker_add_class(&link_elf_class); } SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_SECOND, link_elf_init, 0); static int -link_elf_preload_parse_symbols(elf_file_t ef) -{ - caddr_t pointer; - caddr_t ssym, esym, base; - caddr_t strtab; - int strcnt; - Elf_Sym* symtab; - int symcnt; - - if (ef->modptr == NULL) - return 0; - pointer = preload_search_info(ef->modptr, MODINFO_METADATA|MODINFOMD_SSYM); - if (pointer == NULL) - return 0; - ssym = *(caddr_t *)pointer; - pointer = preload_search_info(ef->modptr, MODINFO_METADATA|MODINFOMD_ESYM); - if (pointer == NULL) - return 0; - esym = *(caddr_t *)pointer; - - base = ssym; - - symcnt = *(long *)base; - base += sizeof(long); - symtab = (Elf_Sym *)base; - base += roundup(symcnt, sizeof(long)); - - if (base > esym || base < ssym) { - printf("Symbols are corrupt!\n"); - return EINVAL; - } - - strcnt = *(long *)base; - base += sizeof(long); - strtab = base; - base += roundup(strcnt, sizeof(long)); - - if (base > esym || base < ssym) { - printf("Symbols are corrupt!\n"); - return EINVAL; - } - - ef->ddbsymtab = symtab; - ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); - ef->ddbstrtab = strtab; - ef->ddbstrcnt = strcnt; - - return 0; -} - -static int -parse_dynamic(elf_file_t ef) -{ - Elf_Dyn *dp; - int plttype = DT_REL; - - for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) { - switch (dp->d_tag) { - case DT_HASH: - { - /* From src/libexec/rtld-elf/rtld.c */ - const Elf_Hashelt *hashtab = (const Elf_Hashelt *) - (ef->address + dp->d_un.d_ptr); - ef->nbuckets = hashtab[0]; - ef->nchains = hashtab[1]; - ef->buckets = hashtab + 2; - ef->chains = ef->buckets + ef->nbuckets; - break; - } - case DT_STRTAB: - ef->strtab = (caddr_t) (ef->address + dp->d_un.d_ptr); - break; - case DT_STRSZ: - ef->strsz = dp->d_un.d_val; - break; - case DT_SYMTAB: - ef->symtab = (Elf_Sym*) (ef->address + dp->d_un.d_ptr); - break; - case DT_SYMENT: - if (dp->d_un.d_val != sizeof(Elf_Sym)) - return ENOEXEC; - break; - case DT_PLTGOT: - ef->got = (Elf_Addr *) (ef->address + dp->d_un.d_ptr); - break; - case DT_REL: - ef->rel = (const Elf_Rel *) (ef->address + dp->d_un.d_ptr); - break; - case DT_RELSZ: - ef->relsize = dp->d_un.d_val; - break; - case DT_RELENT: - if (dp->d_un.d_val != sizeof(Elf_Rel)) - return ENOEXEC; - break; - case DT_JMPREL: - ef->pltrel = (const Elf_Rel *) (ef->address + dp->d_un.d_ptr); - break; - case DT_PLTRELSZ: - ef->pltrelsize = dp->d_un.d_val; - break; - case DT_RELA: - ef->rela = (const Elf_Rela *) (ef->address + dp->d_un.d_ptr); - break; - case DT_RELASZ: - ef->relasize = dp->d_un.d_val; - break; - case DT_RELAENT: - if (dp->d_un.d_val != sizeof(Elf_Rela)) - return ENOEXEC; - break; - case DT_PLTREL: - plttype = dp->d_un.d_val; - if (plttype != DT_REL && plttype != DT_RELA) - return ENOEXEC; - break; -#ifdef DDB - case DT_DEBUG: - dp->d_un.d_ptr = (Elf_Addr) &r_debug; - break; -#endif - } - } - - if (plttype == DT_RELA) { - ef->pltrela = (const Elf_Rela *) ef->pltrel; - ef->pltrel = NULL; - ef->pltrelasize = ef->pltrelsize; - ef->pltrelsize = 0; - } - - ef->ddbsymtab = ef->symtab; - ef->ddbsymcnt = ef->nchains; - ef->ddbstrtab = ef->strtab; - ef->ddbstrcnt = ef->strsz; - - return 0; -} - -static int link_elf_link_preload(linker_class_t cls, const char* filename, linker_file_t *result) { - caddr_t modptr, baseptr, sizeptr, dynptr; - char *type; - elf_file_t ef; - linker_file_t lf; - int error; - vm_offset_t dp; - - /* Look to see if we have the file preloaded */ - modptr = preload_search_by_name(filename); - if (modptr == NULL) - return ENOENT; - - type = (char *)preload_search_info(modptr, MODINFO_TYPE); - baseptr = preload_search_info(modptr, MODINFO_ADDR); - sizeptr = preload_search_info(modptr, MODINFO_SIZE); - dynptr = preload_search_info(modptr, MODINFO_METADATA|MODINFOMD_DYNAMIC); - if (type == NULL || - (strcmp(type, "elf" __XSTRING(__ELF_WORD_SIZE) " module") != 0 && - strcmp(type, "elf module") != 0)) return (EFTYPE); - if (baseptr == NULL || sizeptr == NULL || dynptr == NULL) - return (EINVAL); - - lf = linker_make_file(filename, &link_elf_class); - if (lf == NULL) { - return ENOMEM; - } - - ef = (elf_file_t) lf; - ef->preloaded = 1; - ef->modptr = modptr; - ef->address = *(caddr_t *)baseptr; -#ifdef SPARSE_MAPPING - ef->object = 0; -#endif - dp = (vm_offset_t)ef->address + *(vm_offset_t *)dynptr; - ef->dynamic = (Elf_Dyn *)dp; - lf->address = ef->address; - lf->size = *(size_t *)sizeptr; - - error = parse_dynamic(ef); - if (error) { - linker_file_unload(lf); - return error; - } - link_elf_reloc_local(lf); - *result = lf; - return (0); } static int link_elf_link_preload_finish(linker_file_t lf) { - elf_file_t ef; - int error; - - ef = (elf_file_t) lf; -#if 0 /* this will be more trouble than it's worth for now */ - for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) { - if (dp->d_tag != DT_NEEDED) - continue; - modname = ef->strtab + dp->d_un.d_val; - error = linker_load_module(modname, lf); - if (error) - goto out; - } -#endif - error = relocate_file(ef); - if (error) - return error; - (void)link_elf_preload_parse_symbols(ef); - - return (link_elf_link_common_finish(lf)); + return (EFTYPE); } static int @@ -621,6 +270,8 @@ * We rely on the program header being in the first page. This is * not strictly required by the ABI specification, but it seems to * always true in practice. And, it simplifies things considerably. + * XXX section table, not program header. And we should not depend + * XXX on this because the section table is likely to be bigger. */ if (!((hdr->e_phentsize == sizeof(Elf_Phdr)) && (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= PAGE_SIZE) && @@ -632,7 +283,14 @@ * * We rely on there being exactly two load segments, text and data, * in that order. + * + * XXX do several passes of section table instead. + * XXX 1) count various things needed to size arrays + * XXX 2) grab info about things like PROGBITS/REL/RELA/STRTAB/SYMTAB + * XXX 3) read the string and symbol tables so we can do relocations etc + * XXX 4) (later on) load the rest of the entries. */ +/* XXX *************** STEP 1 GOES HERE ************* XXX */ phdr = (Elf_Phdr *) (firstpage + hdr->e_phoff); phlimit = phdr + hdr->e_phnum; nsegs = 0; @@ -680,7 +338,64 @@ error = ENOEXEC; goto out; } +/* XXX *************** STEP 2 GOES HERE ************* XXX */ +/* XXX *************** STEP 3 GOES HERE ************* XXX */ + + /* Try and load the symbol table if it's present. (you can strip it!) */ + nbytes = hdr->e_shnum * hdr->e_shentsize; + if (nbytes == 0 || hdr->e_shoff == 0) + goto nosyms; + shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO); + if (shdr == NULL) { + error = ENOMEM; + goto out; + } + error = vn_rdwr(UIO_READ, nd.ni_vp, + (caddr_t)shdr, nbytes, hdr->e_shoff, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) + goto out; + symtabindex = -1; + symstrindex = -1; + for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_type == SHT_SYMTAB) { + symtabindex = i; + symstrindex = shdr[i].sh_link; + } + } + if (symtabindex < 0 || symstrindex < 0) + goto nosyms; + + symcnt = shdr[symtabindex].sh_size; + ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK); + strcnt = shdr[symstrindex].sh_size; + ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK); + if (ef->symbase == NULL || ef->strbase == NULL) { + error = ENOMEM; + goto out; + } + error = vn_rdwr(UIO_READ, nd.ni_vp, + ef->symbase, symcnt, shdr[symtabindex].sh_offset, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) + goto out; + error = vn_rdwr(UIO_READ, nd.ni_vp, + ef->strbase, strcnt, shdr[symstrindex].sh_offset, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, + &resid, td); + if (error) + goto out; + + ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); + ef->ddbsymtab = (const Elf_Sym *)ef->symbase; + ef->ddbstrcnt = strcnt; + ef->ddbstrtab = ef->strbase; + +/* XXX *************** STEP 4 GOES HERE ************* XXX */ + /* * Allocate the entire address space of the object, to stake out our * contiguous region, and to establish the base address for relocation. @@ -749,92 +464,20 @@ #endif } -#ifdef GPROF - /* Update profiling information with the new text segment. */ - kmupetext((uintfptr_t)(mapbase + segs[0]->p_vaddr - base_vaddr + - segs[0]->p_memsz)); -#endif - - ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr); + /* ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr); */ lf->address = ef->address; lf->size = mapsize; - error = parse_dynamic(ef); - if (error) - goto out; link_elf_reloc_local(lf); error = linker_load_dependencies(lf); if (error) goto out; -#if 0 /* this will be more trouble than it's worth for now */ - for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) { - if (dp->d_tag != DT_NEEDED) - continue; - modname = ef->strtab + dp->d_un.d_val; - error = linker_load_module(modname, lf); - if (error) - goto out; - } -#endif error = relocate_file(ef); if (error) goto out; - /* Try and load the symbol table if it's present. (you can strip it!) */ - nbytes = hdr->e_shnum * hdr->e_shentsize; - if (nbytes == 0 || hdr->e_shoff == 0) - goto nosyms; - shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO); - if (shdr == NULL) { - error = ENOMEM; - goto out; - } - error = vn_rdwr(UIO_READ, nd.ni_vp, - (caddr_t)shdr, nbytes, hdr->e_shoff, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; - symtabindex = -1; - symstrindex = -1; - for (i = 0; i < hdr->e_shnum; i++) { - if (shdr[i].sh_type == SHT_SYMTAB) { - symtabindex = i; - symstrindex = shdr[i].sh_link; - } - } - if (symtabindex < 0 || symstrindex < 0) - goto nosyms; - - symcnt = shdr[symtabindex].sh_size; - ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK); - strcnt = shdr[symstrindex].sh_size; - ef->strbase = malloc(strcnt, M_LINKER, M_WAITOK); - - if (ef->symbase == NULL || ef->strbase == NULL) { - error = ENOMEM; - goto out; - } - error = vn_rdwr(UIO_READ, nd.ni_vp, - ef->symbase, symcnt, shdr[symtabindex].sh_offset, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; - error = vn_rdwr(UIO_READ, nd.ni_vp, - ef->strbase, strcnt, shdr[symstrindex].sh_offset, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, - &resid, td); - if (error) - goto out; - - ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); - ef->ddbsymtab = (const Elf_Sym *)ef->symbase; - ef->ddbstrcnt = strcnt; - ef->ddbstrtab = ef->strbase; - error = link_elf_link_common_finish(lf); if (error) goto out; @@ -861,23 +504,9 @@ { elf_file_t ef = (elf_file_t) file; -#ifdef DDB - if (ef->gdb.l_ld) { - GDB_STATE(RT_DELETE); - free((void *)(uintptr_t)ef->gdb.l_name, M_LINKER); - link_elf_delete_gdb(&ef->gdb); - GDB_STATE(RT_CONSISTENT); - } -#endif - /* Notify MD code that a module is being unloaded. */ elf_cpu_unload_file(file); - if (ef->preloaded) { - link_elf_unload_preload(file); - return; - } - #ifdef SPARSE_MAPPING if (ef->object) { vm_map_remove(kernel_map, (vm_offset_t) ef->address, @@ -895,13 +524,6 @@ free(ef->strbase, M_LINKER); } -static void -link_elf_unload_preload(linker_file_t file) -{ - if (file->filename) - preload_delete_name(file->filename); -} - static const char * symbol_name(elf_file_t ef, Elf_Word r_info) { @@ -982,26 +604,6 @@ return 0; } -/* - * Hash function for symbol table lookup. Don't even think about changing - * this. It is specified by the System V ABI. - */ -static unsigned long -elf_hash(const char *name) -{ - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; - - while (*p != '\0') { - h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; - } - return h; -} - static int link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym) { @@ -1009,44 +611,9 @@ unsigned long symnum; const Elf_Sym* symp; const char *strp; - unsigned long hash; int i; - /* First, search hashed global symbols */ - hash = elf_hash(name); - symnum = ef->buckets[hash % ef->nbuckets]; - - while (symnum != STN_UNDEF) { - if (symnum >= ef->nchains) { - printf("link_elf_lookup_symbol: corrupt symbol table\n"); - return ENOENT; - } - - symp = ef->symtab + symnum; - if (symp->st_name == 0) { - printf("link_elf_lookup_symbol: corrupt symbol table\n"); - return ENOENT; - } - - strp = ef->strtab + symp->st_name; - - if (strcmp(name, strp) == 0) { - if (symp->st_shndx != SHN_UNDEF || - (symp->st_value != 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) { - *sym = (c_linker_sym_t) symp; - return 0; - } else - return ENOENT; - } - - symnum = ef->chains[symnum]; - } - - /* If we have not found it, look at the full table (if loaded) */ - if (ef->symtab == ef->ddbsymtab) - return ENOENT; - +/* XXX search for globals first */ /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { strp = ef->ddbstrtab + symp->st_name; @@ -1070,14 +637,6 @@ elf_file_t ef = (elf_file_t) lf; const Elf_Sym* es = (const Elf_Sym*) sym; - if (es >= ef->symtab && es < (ef->symtab + ef->nchains)) { - symval->name = ef->strtab + es->st_name; - symval->value = (caddr_t) ef->address + es->st_value; - symval->size = es->st_size; - return 0; - } - if (ef->symtab == ef->ddbsymtab) - return ENOENT; if (es >= ef->ddbsymtab && es < (ef->ddbsymtab + ef->ddbsymcnt)) { symval->name = ef->ddbstrtab + es->st_name; symval->value = (caddr_t) ef->address + es->st_value; @@ -1200,21 +759,6 @@ return (0); } -#ifdef __ia64__ -/* - * Each KLD has its own GP. The GP value for each load module is given by - * DT_PLTGOT on ia64. We need GP to construct function descriptors, but - * don't have direct access to the ELF file structure. The link_elf_get_gp() - * function returns the GP given a pointer to a generic linker file struct. - */ -Elf_Addr -link_elf_get_gp(linker_file_t lf) -{ - elf_file_t ef = (elf_file_t)lf; - return (Elf_Addr)ef->got; -} -#endif - const Elf_Sym * elf_get_sym(linker_file_t lf, Elf_Word symidx) { From owner-p4-projects@FreeBSD.ORG Sun Mar 14 14:25:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE6B216A4D0; Sun, 14 Mar 2004 14:25:18 -0800 (PST) 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 7EC4E16A4CE for ; Sun, 14 Mar 2004 14:25:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73D5043D1F for ; Sun, 14 Mar 2004 14:25:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2EMPIGe043722 for ; Sun, 14 Mar 2004 14:25:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2EMPGMb043685 for perforce@freebsd.org; Sun, 14 Mar 2004 14:25:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 14 Mar 2004 14:25:16 -0800 (PST) Message-Id: <200403142225.i2EMPGMb043685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2004 22:25:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=48983 Change 48983 by jmallett@jmallett_oingo on 2004/03/14 14:24:54 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#25 integrate .. //depot/projects/mips/etc/Makefile#15 integrate .. //depot/projects/mips/etc/defaults/rc.conf#18 integrate .. //depot/projects/mips/etc/rc.d/named#5 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/mips/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/mips/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/mips/sys/conf/files.i386#22 integrate .. //depot/projects/mips/sys/conf/files.pc98#20 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#13 integrate .. //depot/projects/mips/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/mips/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/mips/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/mips/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/mips/sys/dev/ex/if_ex.c#7 integrate .. //depot/projects/mips/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/mips/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/mips/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/mips/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#11 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/mips/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/mips/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mips/sys/dev/sbni/if_sbni.c#6 integrate .. //depot/projects/mips/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/mips/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/mips/sys/dev/tx/if_tx.c#9 integrate .. //depot/projects/mips/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/mips/sys/dev/usb/if_aue.c#10 integrate .. //depot/projects/mips/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/mips/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/mips/sys/dev/usb/if_kue.c#9 integrate .. //depot/projects/mips/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#20 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#20 integrate .. //depot/projects/mips/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/mips/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/mips/sys/dev/wl/if_wl.c#8 integrate .. //depot/projects/mips/sys/dev/xe/if_xe.c#8 integrate .. //depot/projects/mips/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#23 integrate .. //depot/projects/mips/sys/i386/include/cdk.h#2 delete .. //depot/projects/mips/sys/i386/isa/README.stl#2 delete .. //depot/projects/mips/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/mips/sys/i386/isa/if_le.c#9 integrate .. //depot/projects/mips/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/mips/sys/i386/isa/istallion.c#8 delete .. //depot/projects/mips/sys/i386/isa/stallion.c#7 delete .. //depot/projects/mips/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/mips/sys/pci/if_dc.c#17 integrate .. //depot/projects/mips/sys/pci/if_de.c#9 integrate .. //depot/projects/mips/sys/pci/if_pcn.c#11 integrate .. //depot/projects/mips/sys/pci/if_rl.c#16 integrate .. //depot/projects/mips/sys/pci/if_sf.c#11 integrate .. //depot/projects/mips/sys/pci/if_sis.c#14 integrate .. //depot/projects/mips/sys/pci/if_sk.c#11 integrate .. //depot/projects/mips/sys/pci/if_ste.c#11 integrate .. //depot/projects/mips/sys/pci/if_ti.c#14 integrate .. //depot/projects/mips/sys/pci/if_tl.c#11 integrate .. //depot/projects/mips/sys/pci/if_vr.c#13 integrate .. //depot/projects/mips/sys/pci/if_wb.c#11 integrate .. //depot/projects/mips/sys/pci/if_xl.c#15 integrate .. //depot/projects/mips/usr.bin/finger/extern.h#2 integrate .. //depot/projects/mips/usr.bin/finger/finger.h#2 integrate .. //depot/projects/mips/usr.bin/finger/lprint.c#3 integrate .. //depot/projects/mips/usr.bin/mt/mt.c#3 integrate .. //depot/projects/mips/usr.sbin/Makefile#19 integrate .. //depot/projects/mips/usr.sbin/stallion/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/Makefile.inc#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/2681.sys.uu#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/cdk.sys.uu#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/stl.4#3 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/stlload.8#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/stlload.c#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/stlstats.8#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/stlstats.c#2 delete Differences ... ==== //depot/projects/mips/Makefile.inc1#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -261,7 +261,7 @@ mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include + -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo ==== //depot/projects/mips/etc/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.326 2004/03/14 17:18:39 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -64,9 +64,6 @@ distribute: cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ - ${DISTDIR}/${DISTRIBUTION}/boot/device.hints distribution: cd ${.CURDIR}; \ @@ -162,6 +159,9 @@ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ + ${DESTDIR}/boot/device.hints distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ ==== //depot/projects/mips/etc/defaults/rc.conf#18 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.199 2004/03/03 15:21:01 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.200 2004/03/14 19:10:05 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -145,12 +145,9 @@ # named. It may be possible to run named in a sandbox, man security for # details. # -named_rcng="NO" # XXX Temporary. Enable to use new rc - # functionality in support of named. See - # variables below. named_enable="NO" # Run named, the DNS server (or NO). named_program="/usr/sbin/named" # path to named, if you want a different one. -named_flags="-u bind -g bind" # Flags for named +named_flags="-u bind" # Flags for named named_pidfile="/var/run/named/pid" # Pid file named_chrootdir="" # Chroot directory (or "" not to auto-chroot it) named_chroot_autoupdate="YES" # Automatically install/update chrooted ==== //depot/projects/mips/etc/rc.d/named#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.8 2004/01/17 10:59:43 mtm Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.9 2004/03/14 19:10:05 dougb Exp $ # # PROVIDE: named @@ -13,12 +13,9 @@ name="named" rcvar=`set_rcvar` -command="/usr/sbin/${name}" start_precmd="named_precmd" required_dirs="$named_chrootdir" # if it is set, it must exist extra_commands="reload" -nuser=bind -ngroup=bind # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage @@ -64,28 +61,16 @@ { ln -fs "${named_chrootdir}${named_pidfile}" ${named_pidfile} ln -fs "${named_chrootdir}/var/run/ndc" /var/run/ndc - } named_precmd() { - ! checkyesno named_rcng && return 0 # Is the user using a sandbox? - if [ -z "$named_chrootdir" ]; then - rc_flags="-u $nuser -g $ngroup $rc_flags" - return 0 + if [ -n "$named_chrootdir" ]; then + rc_flags="$rc_flags -t $named_chrootdir" + checkyesno named_chroot_autoupdate && chroot_autoupdate + checkyesno named_symlink_enable && make_symlinks fi - - # Do the following checks only if the user wants them done - checkyesno named_chroot_autoupdate && chroot_autoupdate - - # Make the symlinks only if the user wants them done. - checkyesno named_symlink_enable && make_symlinks - - # Change run_rc_commands()'s internal copy of $named_flags - # - ! checkyesno named_rcng && return - rc_flags="-u $nuser -g $ngroup -t ${named_chrootdir} $rc_flags" } load_rc_config $name ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.688 2004/03/13 16:45:05 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.689 2004/03/14 08:47:20 hrs Exp $ 2000 @@ -215,8 +215,17 @@ Platform-Specific Hardware Support - - + Several old drivers for ISA cards have been removed, + including + the asc driver for GI1904-based hand scanners, + the ctx driver for CORTEX-I Frame Grabber, + the gp driver for National Instruments AT-GPIB and AT-GPIB/TNT boards, + the stl and stli drivers for Stallion Technologies multiport serial + controllers, and the wt driver for Archive/Wangtek cartridge tapes. + They are currently non-functional, and would require a considerable + amount of work to make them work under the new API in 5-CURRENT. + The userland support such as related ioctls and the sasc + utility have also been removed. @@ -453,9 +462,14 @@ multilabel flag on new filesystems without requiring the use of &man.tunefs.8;. - &man.nologin.8; now support reporting login attempts via + &man.nologin.8; now reports login attempts via &man.syslogd.8;. + &man.nologin.8; has been moved from /sbin/nologin + to /usr/sbin/nologin, and + /sbin/nologin remains as a symbolic link + for backward compatibility. + A bugfix has been applied to NSS support, which fixes problems when using third-party NSS modules (such as net/nss_ldap) and groups with large ==== //depot/projects/mips/share/man/man5/rc.conf.5#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.206 2004/03/04 08:25:53 mtm Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.207 2004/03/14 19:10:06 dougb Exp $ .\" .Dd March 3, 2002 .Dt RC.CONF 5 @@ -1027,18 +1027,6 @@ .Dq Li YES , these are the flags to pass to .Xr inetd 8 . -.It Va named_rcng -.Pq Vt bool -If set to -.Dq Li YES -use new functionality provided in the -.Pa /etc/rc.d/named -script to facilitate a -.Xr chroot 8 -instance of -.Xr named 8 . -This variable is experimental. -It may be removed or changed in the near future. .It Va named_enable .Pq Vt bool If set to ==== //depot/projects/mips/sys/boot/pc98/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.34 2004/02/13 15:26:22 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -85,7 +85,10 @@ FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBPC98} -lstand .include ==== //depot/projects/mips/sys/boot/pc98/loader/main.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.16 2003/09/08 09:11:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.17 2004/03/14 09:43:15 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -112,7 +112,7 @@ /* * Special handling for PXE and CD booting. */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { /* * We only want the PXE disk to try to init itself in the below * walk through devsw if we actually booted off of PXE. @@ -173,7 +173,7 @@ new_currdev.d_dev = &biosdisk; /* new-style boot loaders such as pxeldr and cdldr */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { if ((kargs->bootflags & KARGS_FLAGS_CD) != 0) { /* we are booting from a CD with cdboot */ new_currdev.d_dev = &bioscd; ==== //depot/projects/mips/sys/conf/files.i386#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.472 2004/03/14 05:31:40 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.473 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,6 @@ i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." i386/isa/isa_dma.c optional isa -i386/isa/istallion.c optional stli nowerror i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx @@ -288,7 +287,6 @@ i386/isa/spic.c optional spic i386/isa/spigot.c count spigot i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux ==== //depot/projects/mips/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.288 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -205,12 +205,10 @@ i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." -i386/isa/istallion.c optional stli nowerror i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/mips/sys/dev/an/if_an.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.58 2004/01/10 03:02:04 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.59 2004/03/14 07:12:19 mdodd Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -749,9 +749,6 @@ bcopy((char *)&sc->an_caps.an_oemaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - printf("an%d: Ethernet address: %6D\n", sc->an_unit, - sc->arpcom.ac_enaddr, ":"); - ifp->if_softc = sc; sc->an_unit = unit; if_initname(ifp, device_get_name(sc->an_dev), ==== //depot/projects/mips/sys/dev/bfe/if_bfe.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.6 2004/03/02 05:43:42 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.7 2004/03/14 07:12:20 mdodd Exp $"); #include #include @@ -406,9 +406,6 @@ bfe_get_config(sc); - printf("bfe%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Reset the chip and turn on the PHY */ bfe_chip_reset(sc); ==== //depot/projects/mips/sys/dev/bge/if_bge.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.63 2004/01/13 11:31:09 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.64 2004/03/14 07:12:20 mdodd Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2309,12 +2309,6 @@ goto fail; } - /* - * A Broadcom chip was detected. Inform the world. - */ - printf("bge%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Save ASIC rev. */ sc->bge_chipid = ==== //depot/projects/mips/sys/dev/cnw/if_cnw.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.13 2003/10/31 18:31:58 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.14 2004/03/14 07:12:20 mdodd Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -1628,8 +1628,6 @@ bus_space_read_1(sc->sc_memt, sc->sc_memh, sc->sc_memoff + CNW_EREG_PA + i); } - device_printf(dev, "Ethernet address: %6D\n", - sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ==== //depot/projects/mips/sys/dev/cs/if_cs.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.28 2003/11/04 02:59:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.29 2004/03/14 07:12:20 mdodd Exp $"); /* * @@ -686,10 +686,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - if (bootverbose) - if_printf(ifp, "ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return (0); } ==== //depot/projects/mips/sys/dev/ed/if_ed.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.226 2004/03/03 07:33:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.227 2004/03/14 07:12:20 mdodd Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -1758,11 +1758,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - /* - * Print additional info when attached - */ - if_printf(ifp, "address %6D, ", sc->arpcom.ac_enaddr, ":"); - if (sc->type_str && (*sc->type_str != 0)) printf("type %s ", sc->type_str); else ==== //depot/projects/mips/sys/dev/ep/if_ep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.131 2004/03/14 08:43:55 ru Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -60,9 +60,6 @@ * */ -#include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); - #include #include #include @@ -287,9 +284,6 @@ for (i = 0; i < 3; i++) CSR_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ifp = &sc->arpcom.ac_if; attached = (ifp->if_softc != 0); ==== //depot/projects/mips/sys/dev/ex/if_ex.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.47 2003/10/31 18:32:00 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.48 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver @@ -271,9 +271,6 @@ */ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return(0); } ==== //depot/projects/mips/sys/dev/fe/if_fe.c#7 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.80 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.81 2004/03/14 07:12:21 mdodd Exp $"); /* * @@ -821,8 +821,7 @@ fe_stop(sc); /* Print additional info when attached. */ - device_printf(dev, "address %6D, type %s%s\n", - sc->sc_enaddr, ":" , sc->typestr, + device_printf(dev, "type %s%s\n", sc->typestr, (sc->proto_dlcr4 & FE_D4_DSC) ? ", full duplex" : ""); if (bootverbose) { int buf, txb, bbw, sbw, ram; ==== //depot/projects/mips/sys/dev/fxp/if_fxp.c#15 (text+ko) ==== @@ -28,14 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); #include #include @@ -758,9 +758,6 @@ sc->arpcom.ac_enaddr[3] = myea[1] >> 8; sc->arpcom.ac_enaddr[4] = myea[2] & 0xff; sc->arpcom.ac_enaddr[5] = myea[2] >> 8; - device_printf(dev, "Ethernet address %6D%s\n", - sc->arpcom.ac_enaddr, ":", - sc->flags & FXP_FLAG_SERIAL_MEDIA ? ", 10Mbps" : ""); if (bootverbose) { device_printf(dev, "PCI IDs: %04x %04x %04x %04x %04x\n", pci_get_vendor(dev), pci_get_device(dev), ==== //depot/projects/mips/sys/dev/gx/if_gx.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.14 2004/01/18 10:15:48 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.15 2004/03/14 07:12:21 mdodd Exp $"); #include #include @@ -320,8 +320,6 @@ error = ENXIO; goto fail; } - device_printf(dev, "Ethernet address: %6D\n", - gx->arpcom.ac_enaddr, ":"); /* Allocate the ring buffers. */ gx->gx_rdata = contigmalloc(sizeof(struct gx_ring_data), M_DEVBUF, ==== //depot/projects/mips/sys/dev/ie/if_ie.c#7 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.97 2003/10/31 18:32:02 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.98 2004/03/14 07:12:22 mdodd Exp $"); /* * Intel 82586 Ethernet chip @@ -319,9 +319,6 @@ EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, sc, SHUTDOWN_PRI_DEFAULT); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ether_ifattach(ifp, sc->arpcom.ac_enaddr); return (0); } ==== //depot/projects/mips/sys/dev/lge/if_lge.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.27 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.28 2004/03/14 07:12:22 mdodd Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -572,11 +572,6 @@ lge_read_eeprom(sc, (caddr_t)&eaddr[2], LGE_EE_NODEADDR_1, 1, 0); lge_read_eeprom(sc, (caddr_t)&eaddr[4], LGE_EE_NODEADDR_2, 1, 0); - /* - * A Level 1 chip was detected. Inform the world. - */ - printf("lge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->lge_unit = unit; callout_handle_init(&sc->lge_stat_ch); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/mips/sys/dev/lnc/if_lnc.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.104 2004/03/03 08:33:34 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.105 2004/03/14 07:12:22 mdodd Exp $"); /* #define DIAGNOSTIC @@ -894,13 +894,11 @@ ether_ifattach(&sc->arpcom.ac_if, sc->arpcom.ac_enaddr); - printf("%s: ", sc->arpcom.ac_if.if_xname); if (sc->nic.ic == LANCE || sc->nic.ic == C_LANCE) - printf("%s (%s)", + if_printf(&sc->arpcom.ac_if, "%s (%s)\n", nic_ident[sc->nic.ident], ic_ident[sc->nic.ic]); else - printf("%s", ic_ident[sc->nic.ic]); - printf(" address %6D\n", sc->arpcom.ac_enaddr, ":"); + if_printf(&sc->arpcom.ac_if, "%s\n", ic_ident[sc->nic.ic]); return (1); } ==== //depot/projects/mips/sys/dev/my/if_my.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.22 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.23 2004/03/14 07:12:22 mdodd Exp $"); #include #include @@ -961,11 +961,6 @@ for (i = 0; i < ETHER_ADDR_LEN; ++i) eaddr[i] = CSR_READ_1(sc, MY_PAR0 + i); - /* - * A Myson chip was detected. Inform the world. - */ - printf("my%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->my_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/mips/sys/dev/nge/if_nge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.52 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.53 2004/03/14 07:12:22 mdodd Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -906,11 +906,6 @@ nge_read_eeprom(sc, (caddr_t)&eaddr[2], NGE_EE_NODEADDR + 1, 1, 0); nge_read_eeprom(sc, (caddr_t)&eaddr[0], NGE_EE_NODEADDR + 2, 1, 0); - /* - * A NatSemi chip was detected. Inform the world. - */ - printf("nge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->nge_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/mips/sys/dev/owi/if_owi.c#3 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.4 2003/12/10 15:09:38 bms Exp $"; + "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.5 2004/03/14 07:12:22 mdodd Exp $"; #endif static void wi_intr(void *); @@ -226,8 +226,6 @@ bcopy((char *)&mac.wi_mac_addr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - device_printf(dev, "802.11 address: %6D\n", sc->arpcom.ac_enaddr, ":"); - owi_get_id(sc); if_initname(ifp, device_get_name(dev), sc->wi_unit); ==== //depot/projects/mips/sys/dev/re/if_re.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.17 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.18 2004/03/14 07:12:22 mdodd Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1212,11 +1212,6 @@ } } - /* - * A RealTek chip was detected. Inform the world. - */ - printf("re%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/mips/sys/dev/sbni/if_sbni.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.14 2003/10/31 18:32:04 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.15 2004/03/14 07:12:23 mdodd Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -245,8 +245,7 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - if_printf(ifp, "speed %ld, address %6D, rxl ", - ifp->if_baudrate, sc->arpcom.ac_enaddr, ":"); + if_printf(ifp, "speed %ld, rxl ", ifp->if_baudrate); if (sc->delta_rxl) printf("auto\n"); else ==== //depot/projects/mips/sys/dev/sn/if_sn.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.35 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.36 2004/03/14 07:12:23 mdodd Exp $"); /* * This is a driver for SMC's 9000 series of Ethernet adapters. @@ -201,7 +201,6 @@ p[i + 1] = address >> 8; p[i] = address & 0xFF; } - printf(" MAC address %6D\n", sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ==== //depot/projects/mips/sys/dev/snc/dp83932.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.12 2003/11/01 23:24:38 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.13 2004/03/14 07:12:23 mdodd Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -162,7 +162,6 @@ camdump(sc); } #endif - device_printf(sc->sc_dev, "address %6D\n", myea, ":"); #ifdef SNCDEBUG device_printf(sc->sc_dev, ==== //depot/projects/mips/sys/dev/tx/if_tx.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.80 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.81 2004/03/14 07:12:23 mdodd Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -391,9 +391,6 @@ goto fail; } - /* Display ethernet address ,... */ - device_printf(dev, "address %6D,", sc->sc_macaddr, ":"); - /* board type and ... */ printf(" type "); for(i = 0x2c; i < 0x32; i++) { ==== //depot/projects/mips/sys/dev/txp/if_txp.c#8 (text+ko) ==== @@ -35,14 +35,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); /* * Driver for 3c990 (Typhoon) Ethernet ASIC */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); #include #include @@ -93,7 +93,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"; #endif /* @@ -334,9 +334,6 @@ sc->sc_arpcom.ac_enaddr[4] = ((u_int8_t *)&p2)[1]; sc->sc_arpcom.ac_enaddr[5] = ((u_int8_t *)&p2)[0]; - printf("txp%d: Ethernet address %6D\n", unit, - sc->sc_arpcom.ac_enaddr, ":"); - sc->sc_cold = 0; ifmedia_init(&sc->sc_ifmedia, 0, txp_ifmedia_upd, txp_ifmedia_sts); ==== //depot/projects/mips/sys/dev/usb/if_aue.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.79 2004/03/14 07:12:23 mdodd Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -730,11 +730,6 @@ */ aue_read_eeprom(sc, (caddr_t)&eaddr, 0, 3, 0); - /* - * A Pegasus chip was detected. Inform the world. - */ - printf("aue%d: Ethernet address: %6D\n", sc->aue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/mips/sys/dev/usb/if_axe.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.11 2004/03/14 07:12:23 mdodd Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -492,11 +492,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 14 16:35:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE99E16A4D0; Sun, 14 Mar 2004 16:35:03 -0800 (PST) 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 A432C16A4CE for ; Sun, 14 Mar 2004 16:35:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E1B243D41 for ; Sun, 14 Mar 2004 16:35:03 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2F0Z3Ge074184 for ; Sun, 14 Mar 2004 16:35:03 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2F0Z3CM074181 for perforce@freebsd.org; Sun, 14 Mar 2004 16:35:03 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 14 Mar 2004 16:35:03 -0800 (PST) Message-Id: <200403150035.i2F0Z3CM074181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 00:35:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=48994 Change 48994 by jmallett@jmallett_oingo on 2004/03/14 16:34:53 Quote NM in case you need to force it to something with args :/ Affected files ... .. //depot/projects/mips/sys/conf/kern.post.mk#15 edit Differences ... ==== //depot/projects/mips/sys/conf/kern.post.mk#15 (text+ko) ==== @@ -116,7 +116,7 @@ ./assym.s: assym.s assym.s: $S/kern/genassym.sh genassym.o - NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} + NM="${NM}" sh $S/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: $S/$M/$M/genassym.c ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c From owner-p4-projects@FreeBSD.ORG Sun Mar 14 20:10:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D76D616A4D0; Sun, 14 Mar 2004 20:10:29 -0800 (PST) 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 A59B616A4CE for ; Sun, 14 Mar 2004 20:10:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 980EE43D48 for ; Sun, 14 Mar 2004 20:10:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2F4ATGe028036 for ; Sun, 14 Mar 2004 20:10:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2F4ARZp028033 for perforce@freebsd.org; Sun, 14 Mar 2004 20:10:27 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 14 Mar 2004 20:10:27 -0800 (PST) Message-Id: <200403150410.i2F4ARZp028033@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 Subject: PERFORCE change 49001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 04:10:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=49001 Change 49001 by marcel@marcel_nfs on 2004/03/14 20:09:45 Implement the minimal (and non-optional) commands. As a bonus, implement '?' as well. Needs more work, but allows to break into the debugger and continue. Affected files ... .. //depot/projects/gdb/sys/gdb/gdb.h#5 edit .. //depot/projects/gdb/sys/gdb/gdb_int.h#2 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#4 edit .. //depot/projects/gdb/sys/gdb/gdb_packet.c#2 edit .. //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#2 edit Differences ... ==== //depot/projects/gdb/sys/gdb/gdb.h#5 (text+ko) ==== @@ -61,8 +61,11 @@ struct trapframe; +uintmax_t gdb_cpu_getreg(int, struct trapframe *); +ssize_t gdb_cpu_getregs(struct trapframe *, void *, size_t); int gdb_cpu_regsz(int); -uintmax_t gdb_cpu_regval(int, struct trapframe *); +void gdb_cpu_setreg(int, struct trapframe *, uintmax_t); int gdb_cpu_signal(int, int); +void gdb_cpu_singlestep(int, struct trapframe *); #endif /* !_GDB_GDB_H_ */ ==== //depot/projects/gdb/sys/gdb/gdb_int.h#2 (text+ko) ==== @@ -36,19 +36,30 @@ extern struct gdb_dbgport *gdb_cur; extern char *gdb_rxp; +extern size_t gdb_rxsz; extern char *gdb_txp; int gdb_rx_begin(void); +int gdb_rx_varhex(uintmax_t *); static __inline int gdb_rx_char(void) { - return (*gdb_rxp++); + int c; + + if (gdb_rxsz > 0) { + c = *gdb_rxp++; + gdb_rxsz--; + } else + c = -1; + return (c); } void gdb_tx_begin(char); int gdb_tx_end(void); +int gdb_tx_memory(const unsigned char *, size_t); void gdb_tx_reg(int, struct trapframe *); +int gdb_tx_regs(struct trapframe *); static __inline void gdb_tx_char(char c) @@ -56,12 +67,27 @@ *gdb_txp++ = c; } +static __inline int +gdb_tx_empty(void) +{ + gdb_tx_begin('\0'); + return (gdb_tx_end()); +} + static __inline void gdb_tx_hex(uintmax_t n, int sz) { gdb_txp += sprintf(gdb_txp, "%0*jx", sz, n); } +static __inline int +gdb_tx_err(int err) +{ + gdb_tx_begin('E'); + gdb_tx_hex(err, 2); + return (gdb_tx_end()); +} + static __inline void gdb_tx_str(const char *s) { ==== //depot/projects/gdb/sys/gdb/gdb_main.c#4 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -85,7 +86,13 @@ static int gdb_trap(int type, int code, struct trapframe *tf) { - const char *p; + struct proc *p; + uintmax_t addr, size; + int tid_cont, tid_gen; + + p = curthread->td_proc; + tid_cont = -1; + tid_gen = (p != NULL) ? p->p_pid : 0; /* * Send a T packet. We currently do not support watchpoints (the @@ -100,14 +107,51 @@ gdb_tx_reg(GDB_REG_SP, tf); gdb_tx_char(';'); gdb_tx_str("thread:"); - gdb_tx_varhex((uintptr_t)curthread); + gdb_tx_varhex(tid_gen); + gdb_tx_char(';'); gdb_tx_end(); /* XXX check error condition. */ while (gdb_rx_begin() == 0) { - p = gdb_rxp; + printf("GDB: got '%s'\n", gdb_rxp); switch (gdb_rx_char()) { + case '?': + gdb_tx_begin('S'); + gdb_tx_hex(gdb_cpu_signal(type, code), 2); + gdb_tx_end(); + break; case 'c': /* continue */ + if (!gdb_rx_varhex(&addr)) + gdb_cpu_setreg(GDB_REG_PC, tf, addr); + gdb_cpu_singlestep(0, tf); + return (1); + case 'g': + gdb_tx_regs(tf); + break; + case 'G': + gdb_tx_err(0); + break; + case 'm': + if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' || + gdb_rx_varhex(&size)) + gdb_tx_err(EINVAL); + else + gdb_tx_memory((char *)(uintptr_t)addr, size); + break; + case 'M': + gdb_tx_err(0); + break; + case 's': /* single step */ + if (!gdb_rx_varhex(&addr)) + gdb_cpu_setreg(GDB_REG_PC, tf, addr); + gdb_cpu_singlestep(1, tf); return (1); + case -1: + /* Empty command. Treat as unknown command. */ + /* FALLTHROUGH */ + default: + /* Unknown command. Send empty response. */ + gdb_tx_empty(); + break; } } return (0); ==== //depot/projects/gdb/sys/gdb/gdb_packet.c#2 (text+ko) ==== @@ -29,18 +29,20 @@ #include #include +#include #include #include static char gdb_rxbuf[GDB_BUFSZ]; char *gdb_rxp = NULL; -static size_t gdb_rxsz = 0; +size_t gdb_rxsz = 0; static char gdb_txbuf[GDB_BUFSZ]; char *gdb_txp = NULL; /* Used in inline functions. */ -#define C2N(c) ((c < 'A') ? c - '0' : 10 + (c < 'a') ? c - 'A' : c - 'a') -#define N2C(n) ((n < 10) ? n + '0' : n + 'a' - 10) +#define C2N(c) (((c) < 'A') ? (c) - '0' : \ + 10 + (((c) < 'a') ? (c) - 'A' : (c) - 'a')) +#define N2C(n) (((n) < 10) ? (n) + '0' : (n) + 'a' - 10) /* * Functions to receive and extract from a packet. @@ -49,7 +51,7 @@ int gdb_rx_begin(void) { - unsigned char c, cksum; + int c, cksum; gdb_rxp = NULL; do { @@ -71,7 +73,7 @@ cksum += c; } gdb_rxbuf[gdb_rxsz] = 0; - printf("GDB: got `%s'\n", gdb_rxbuf); + cksum &= 0xff; /* Bail out on a buffer overflow. */ if (c != '#') { @@ -80,16 +82,50 @@ } c = gdb_cur->gdb_getc(); - cksum -= C2N(c) << 4; + cksum -= (C2N(c) << 4) & 0xf0; c = gdb_cur->gdb_getc(); - cksum -= C2N(c); + cksum -= C2N(c) & 0x0f; gdb_cur->gdb_putc((cksum == 0) ? '+' : '-'); + if (cksum != 0) + printf("GDB: packet `%s' has invalid checksum\n", + gdb_rxbuf); } while (cksum != 0); gdb_rxp = gdb_rxbuf; return (0); } +int +gdb_rx_varhex(uintmax_t *vp) +{ + uintmax_t v; + int c, neg, valid; + + c = gdb_rx_char(); + if (c == -1) + return (-1); + neg = (c == '-') ? 1 : 0; + if (neg == 1) + c = gdb_rx_char(); + v = 0; + valid = (isxdigit(c)) ? 1 : 0; + while (valid) { + v <<= 4; + v += C2N(c); + c = gdb_rx_char(); + if (!isxdigit(c)) + break; + } + if (!valid || c != -1) { + gdb_rxp -= 1 + neg - valid; + gdb_rxsz += 1 + neg - valid; + } + *vp = (neg) ? -v : v; + if (valid) + printf("GDB: %s: v=%jd (%jx)\n", __func__, *vp, *vp); + return ((valid) ? 0 : -1); +} + /* * Function to build and send a package. */ @@ -99,7 +135,25 @@ { gdb_txp = gdb_txbuf; - gdb_tx_char(tp); + if (tp != '\0') + gdb_tx_char(tp); +} + +int +gdb_tx_memory(const unsigned char *addr, size_t size) +{ + + if (size > (sizeof(gdb_txbuf) << 1)) + return (gdb_tx_err(ENOSPC)); + gdb_tx_begin(0); + while (size-- > 0) { + *gdb_txp++ = N2C(*addr >> 4); + *gdb_txp++ = N2C(*addr & 0x0f); + addr++; + } + *gdb_txp = 0; + printf("`%s'\n", gdb_txbuf); + return (gdb_tx_end()); } void @@ -108,7 +162,18 @@ gdb_tx_varhex(regnum); gdb_tx_char(':'); - gdb_tx_hex(gdb_cpu_regval(regnum, tf), gdb_cpu_regsz(regnum) << 1); + gdb_tx_hex(gdb_cpu_getreg(regnum, tf), gdb_cpu_regsz(regnum) << 1); +} + +int +gdb_tx_regs(struct trapframe *tf) +{ + ssize_t regsz; + + regsz = gdb_cpu_getregs(tf, gdb_rxbuf, sizeof(gdb_rxbuf)); + if (regsz < 0) + return (gdb_tx_err(ENOSPC)); + return (gdb_tx_memory(gdb_rxbuf, regsz)); } int ==== //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#2 (text+ko) ==== @@ -34,25 +34,63 @@ #include #include +#include +#include #include #include +uintmax_t +gdb_cpu_getreg(int regnum, struct trapframe *tf) +{ + switch (regnum) { + case GDB_REG_FP: return ((unsigned int)tf->tf_ebp); + case GDB_REG_PC: return ((unsigned int)tf->tf_eip); + case GDB_REG_SP: return ((unsigned int)tf->tf_esp); + } + return (0); +} + +ssize_t +gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) +{ + struct reg *r = buf; + + if (sizeof(*r) > bufsz) + return (-1); + r->r_cs = tf->tf_cs; + r->r_ds = tf->tf_ds; + r->r_eax = tf->tf_eax; + r->r_ebp = tf->tf_ebp; + r->r_ebx = tf->tf_ebx; + r->r_ecx = tf->tf_ecx; + r->r_edi = tf->tf_edi; + r->r_edx = tf->tf_edx; + r->r_eflags = tf->tf_eflags; + r->r_eip = tf->tf_eip; + r->r_es = tf->tf_es; + r->r_esi = tf->tf_esi; + r->r_esp = tf->tf_esp; + r->r_fs = tf->tf_fs; + r->r_gs = 0; + r->r_ss = tf->tf_ss; + return (sizeof(*r)); +} + int gdb_cpu_regsz(int regnum) { return (4); /* XXX not really. */ } -uintmax_t -gdb_cpu_regval(int regnum, struct trapframe *tf) +void +gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) { switch (regnum) { - case GDB_REG_FP: return ((unsigned int)tf->tf_ebp); - case GDB_REG_PC: return ((unsigned int)tf->tf_eip); - case GDB_REG_SP: return ((unsigned int)tf->tf_esp); + case GDB_REG_FP: tf->tf_ebp = val; break; + case GDB_REG_PC: tf->tf_eip = val; break; + case GDB_REG_SP: tf->tf_esp = val; break; } - return (0); } int @@ -78,3 +116,11 @@ } return (SIGEMT); } + +void +gdb_cpu_singlestep(int on, struct trapframe *tf) +{ + + tf->tf_eflags &= ~PSL_T; + tf->tf_eflags |= (on) ? PSL_T : 0; +} From owner-p4-projects@FreeBSD.ORG Sun Mar 14 22:16:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A290316A4D0; Sun, 14 Mar 2004 22:16:02 -0800 (PST) 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 78A1D16A4CE for ; Sun, 14 Mar 2004 22:16:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70FF843D31 for ; Sun, 14 Mar 2004 22:16:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2F6G2Ge062162 for ; Sun, 14 Mar 2004 22:16:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2F6G1Ht062159 for perforce@freebsd.org; Sun, 14 Mar 2004 22:16:01 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 14 Mar 2004 22:16:01 -0800 (PST) Message-Id: <200403150616.i2F6G1Ht062159@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 Subject: PERFORCE change 49004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 06:16:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=49004 Change 49004 by marcel@marcel_nfs on 2004/03/14 22:15:13 Port the GDB backend to ia64. Not functionally complete, but sufficient as a proof of concept for now. Affected files ... .. //depot/projects/gdb/sys/conf/files.ia64#3 edit .. //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#1 add .. //depot/projects/gdb/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#1 add Differences ... ==== //depot/projects/gdb/sys/conf/files.ia64#3 (text+ko) ==== @@ -102,7 +102,7 @@ ia64/ia64/eficlock.c standard ia64/ia64/elf_machdep.c standard ia64/ia64/exception.S standard -ia64/ia64/ia64-gdbstub.c optional gdb +ia64/ia64/gdb_machdep.c optional gdb ia64/ia64/in_cksum.c optional inet ia64/ia64/interrupt.c standard ia64/ia64/locore.S standard no-obj From owner-p4-projects@FreeBSD.ORG Sun Mar 14 23:36:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ADEA16A4D0; Sun, 14 Mar 2004 23:36:42 -0800 (PST) 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 5546A16A4CE for ; Sun, 14 Mar 2004 23:36:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D74643D39 for ; Sun, 14 Mar 2004 23:36:42 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2F7agGe079412 for ; Sun, 14 Mar 2004 23:36:42 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2F7afJE079409 for perforce@freebsd.org; Sun, 14 Mar 2004 23:36:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 14 Mar 2004 23:36:41 -0800 (PST) Message-Id: <200403150736.i2F7afJE079409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 07:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=49008 Change 49008 by jmallett@jmallett_oingo on 2004/03/14 23:35:53 Clean-up... Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#15 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#15 (text+ko) ==== @@ -42,21 +42,18 @@ }; #define CLKF_USERMODE(framep) ((framep)->sr & MIPS_SR_KSU_USER) -#define CLKF_BASEPRI(framep) \ - ((~(framep)->sr & (MIPS_INT_MASK | MIPS_SR_INT_IE)) == 0) - -#ifdef IPL_ICU_MASK -#define ICU_CLKF_BASEPRI(framep) ((framep)->ppl == 0) -#endif - #define CLKF_PC(framep) ((framep)->pc) -#define CLKF_INTR(framep) (0) #define TRAPF_PC(tframe) ((tframe)->tf_regs[TF_EPC]) #define TRAPF_USERMODE(tframe) ((tframe)->tf_regs[TF_SR] & MIPS_SR_KSU_USER) +#if notyet /* XXX */ +#define cpu_getstack(p) ((p)->td_frame->tf_regs[TF_SP]) +#define cpu_setstack(p,sp) ((p)->td_frame->tf_regs[TF_SP] = (sp)) +#else #define cpu_getstack(p) (0) -#define cpu_setstack(p, sp) (0) +#define cpu_setstack(p,sp) (0) +#endif /* * Arrange to handle pending profiling ticks before returning to user mode. From owner-p4-projects@FreeBSD.ORG Mon Mar 15 00:01:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A553416A4E4; Mon, 15 Mar 2004 00:01:15 -0800 (PST) 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 4685016A4E4 for ; Mon, 15 Mar 2004 00:01:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2846643D1D for ; Mon, 15 Mar 2004 00:01:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2F81EGe083790 for ; Mon, 15 Mar 2004 00:01:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2F81Ev8083786 for perforce@freebsd.org; Mon, 15 Mar 2004 00:01:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 15 Mar 2004 00:01:14 -0800 (PST) Message-Id: <200403150801.i2F81Ev8083786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 08:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=49012 Change 49012 by jmallett@jmallett_oingo on 2004/03/15 00:00:18 Put the stack pointer in the trapframe. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#16 edit .. //depot/projects/mips/sys/mips/include/frame.h#4 edit .. //depot/projects/mips/sys/mips/mips/exception.S#23 edit .. //depot/projects/mips/sys/mips/mips/genassym.c#11 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#16 (text+ko) ==== @@ -47,13 +47,8 @@ #define TRAPF_PC(tframe) ((tframe)->tf_regs[TF_EPC]) #define TRAPF_USERMODE(tframe) ((tframe)->tf_regs[TF_SR] & MIPS_SR_KSU_USER) -#if notyet /* XXX */ #define cpu_getstack(p) ((p)->td_frame->tf_regs[TF_SP]) #define cpu_setstack(p,sp) ((p)->td_frame->tf_regs[TF_SP] = (sp)) -#else -#define cpu_getstack(p) (0) -#define cpu_setstack(p,sp) (0) -#endif /* * Arrange to handle pending profiling ticks before returning to user mode. ==== //depot/projects/mips/sys/mips/include/frame.h#4 (text+ko) ==== @@ -65,7 +65,9 @@ #define TF_MULHI 20 #define TF_EPC 21 /* may be changed by trap() call */ -#define TF_NREGS 22 +#define TF_SP 22 + +#define TF_NREGS 23 struct trapframe { __register_t tf_regs[TF_NREGS]; ==== //depot/projects/mips/sys/mips/mips/exception.S#23 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#22 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#23 $ */ #include "opt_ddb.h" @@ -316,6 +316,12 @@ ld v0, TF_REG_V0(k1) /* + * Restore the stack minus TF_SIZE, to account for sp twiddle. + */ + ld sp, TF_REG_SP(k1) + dsubu sp, TF_SIZE + + /* * We are done with the assembler temporary, restore it, and * return with it disabled, just in case. */ @@ -379,6 +385,16 @@ sd a1, TF_REG_EPC(k1) /* + * When restore returns, TF_SIZE gets added to the SP for + * return. So in restore, we subtract TF_SIZE, which means + * the value stored herein will be the value returned to. + * To accomodate this, we add TF_SIZE, which makes up for the + * initial subtraction for the trapframe. + */ + daddu t0, sp, TF_SIZE + sd t0, TF_REG_SP(k1) + + /* * All done. */ jr k0 ==== //depot/projects/mips/sys/mips/mips/genassym.c#11 (text+ko) ==== @@ -163,6 +163,7 @@ ASSYM(TF_REG_MULLO, offsetof(struct trapframe, tf_regs[TF_MULLO])); ASSYM(TF_REG_MULHI, offsetof(struct trapframe, tf_regs[TF_MULHI])); ASSYM(TF_REG_EPC, offsetof(struct trapframe, tf_regs[TF_EPC])); +ASSYM(TF_REG_SP, offsetof(struct trapframe, tf_regs[TF_SP])); ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); ASSYM(CTXSWFRAME_SIZ, sizeof(label_t)); From owner-p4-projects@FreeBSD.ORG Mon Mar 15 03:16:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D82616A4CF; Mon, 15 Mar 2004 03:16:45 -0800 (PST) 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 558E016A4D0 for ; Mon, 15 Mar 2004 03:16:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 463E943D2F for ; Mon, 15 Mar 2004 03:16:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2FBGjGe035047 for ; Mon, 15 Mar 2004 03:16:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2FBGifJ035044 for perforce@freebsd.org; Mon, 15 Mar 2004 03:16:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 15 Mar 2004 03:16:44 -0800 (PST) Message-Id: <200403151116.i2FBGifJ035044@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 Subject: PERFORCE change 49017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 11:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=49017 Change 49017 by rwatson@rwatson_paprika on 2004/03/15 03:16:22 - More NULL/0 tweaks. - Gsc, if_le, if_rdp, isa_compat, spigot removed; more axing cleanup for other isa_compat drivers. - Giant goes back on pfs hooks. - Loop back if_tap global locking. - vslock/unlock restoration. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#7 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#5 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#3 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#11 integrate .. //depot/projects/netperf_socket/sys/i386/include/gsc.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/spigot.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/README.le#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gsc.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ic/lemac.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_le.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/isa_compat.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/isa_device.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spigot.c#3 delete .. //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_extern.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.403 2004/02/02 00:54:59 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.404 2004/03/15 00:49:39 obrien Exp $ machine amd64 cpu HAMMER @@ -188,7 +188,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.34 2004/02/13 15:26:22 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -85,7 +85,10 @@ FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBPC98} -lstand .include ==== //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.16 2003/09/08 09:11:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.17 2004/03/14 09:43:15 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -112,7 +112,7 @@ /* * Special handling for PXE and CD booting. */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { /* * We only want the PXE disk to try to init itself in the below * walk through devsw if we actually booted off of PXE. @@ -173,7 +173,7 @@ new_currdev.d_dev = &biosdisk; /* new-style boot loaders such as pxeldr and cdldr */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { if ((kargs->bootflags & KARGS_FLAGS_CD) != 0) { /* we are booting from a CD with cdboot */ new_currdev.d_dev = &bioscd; ==== //depot/projects/netperf_socket/sys/conf/files.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.473 2004/03/14 06:48:35 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.478 2004/03/14 23:03:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -264,13 +264,8 @@ i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gsc.c count gsc i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa compat_oldisa \ - warning "Old ISA driver compatibility shims present." i386/isa/isa_dma.c optional isa i386/isa/mse.c optional mse i386/isa/nmi.c standard @@ -285,7 +280,6 @@ i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spic.c optional spic -i386/isa/spigot.c count spigot i386/isa/spkr.c optional speaker i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux ==== //depot/projects/netperf_socket/sys/conf/files.pc98#5 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.288 2004/03/14 06:48:35 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.289 2004/03/14 23:03:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -203,8 +203,6 @@ i386/isa/elink.c optional ep i386/isa/elink.c optional ie i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa compat_oldisa \ - warning "Old ISA driver compatibility shims present." i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine ==== //depot/projects/netperf_socket/sys/conf/options.i386#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.211 2004/01/25 15:27:23 bde Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.212 2004/03/14 23:03:56 imp Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h -COMPAT_OLDISA DISABLE_PG_G opt_pmap.h DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf_socket/sys/conf/options.pc98#3 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.174 2004/01/26 12:28:40 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.175 2004/03/14 23:03:56 imp Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h -COMPAT_OLDISA DISABLE_PG_G opt_pmap.h DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.131 2004/03/14 08:43:55 ru Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -60,9 +60,6 @@ * */ -#include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); - #include #include #include ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -715,6 +715,7 @@ /* Handspring, Inc. */ product HANDSPRING VISOR 0x0100 Handspring Visor product HANDSPRING TREO 0x0200 Handspring Treo +product HANDSPRING TREO600 0x0300 Handspring Treo 600 /* Hauppauge Computer Works */ product HAUPPAUGE WINTV_USB_FM 0x4d12 WinTV USB FM ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#7 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.175 2004/03/14 21:57:35 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp */ /* @@ -722,6 +722,7 @@ /* Handspring, Inc. */ #define USB_PRODUCT_HANDSPRING_VISOR 0x0100 /* Handspring Visor */ #define USB_PRODUCT_HANDSPRING_TREO 0x0200 /* Handspring Treo */ +#define USB_PRODUCT_HANDSPRING_TREO600 0x0300 /* Handspring Treo 600 */ /* Hauppauge Computer Works */ #define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#7 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.175 2004/03/14 21:57:35 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp */ /* @@ -1204,6 +1204,12 @@ "Handspring Treo", }, { + USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600, + 0, + "Handspring", + "Handspring Treo 600", + }, + { USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM, 0, "Hauppauge Computer Works", ==== //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.17 2004/01/03 15:30:11 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.18 2004/03/14 21:56:51 joe Exp $ */ /* Also already merged from NetBSD: * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $ @@ -210,6 +210,7 @@ static const struct uvisor_type uvisor_devs[] = { {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR }, 0 }, {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO }, PALM4 }, + {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M500 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M505 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M515 }, PALM4 }, ==== //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.118 2004/02/21 22:47:19 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.119 2004/03/14 23:28:12 rwatson Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -398,7 +398,7 @@ /* XXX - We should probably check more values here */ if (!pmp->pm_BytesPerSec || !SecPerClust - || !pmp->pm_Heads || pmp->pm_Heads > 255 + || !pmp->pm_Heads #ifdef PC98 || !pmp->pm_SecPerTrack || pmp->pm_SecPerTrack > 255) { #else ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.24 2003/10/05 02:43:30 jeff Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.25 2004/03/14 15:57:45 green Exp $ */ #include @@ -222,6 +222,7 @@ { struct pfs_vdata *pvd, *prev; + mtx_lock(&Giant); mtx_lock(&pfs_vncache_mutex); /* * The double loop is necessary because vgone() indirectly @@ -239,6 +240,7 @@ break; } mtx_unlock(&pfs_vncache_mutex); + mtx_unlock(&Giant); } /* ==== //depot/projects/netperf_socket/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.397 2004/01/29 21:24:53 schweikh Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $ machine i386 cpu I486_CPU @@ -201,7 +201,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.12 2004/03/14 22:38:18 imp Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -81,11 +81,6 @@ hint.fe.0.at="isa" hint.fe.0.disabled="1" hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" hint.lnc.0.at="isa" hint.lnc.0.disabled="1" hint.lnc.0.port="0x280" ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#11 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1141 2004/03/14 06:48:34 imp Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1147 2004/03/14 23:03:57 imp Exp $ # # @@ -310,7 +310,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options COMPAT_OLDISA #Use ISA shims and glue for old drivers options AUTO_EOI_1 #options AUTO_EOI_2 @@ -506,14 +505,11 @@ # el: 3Com 3C501 (slow!) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. -# rdp: RealTek RTL 8002-based pocket ethernet adapters # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) # wl: Lucent Wavelan (ISA card only). @@ -551,21 +547,11 @@ hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" -device le 1 -hint.le.0.at="isa" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" -device rdp 1 -hint.rdp.0.at="isa" -hint.rdp.0.port="0x378" -hint.rdp.0.irq="7" -hint.rdp.0.flags="2" device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -632,27 +618,14 @@ # # apm: Laptop Advanced Power Management (experimental) # pmtimer: Timer device driver for power management events (APM or ACPI) -# spigot: The Creative Labs Video Spigot video-acquisition board # cy: Cyclades serial driver # digi: Digiboard driver -# gsc: Genius GS-4500 hand scanner. # spic: Sony Programmable I/O controller (VAIO notebooks) # Notes on APM # The flags takes the following meaning for apm0: # 0x0020 Statclock is broken. -# Notes on the spigot: -# The video spigot is at 0xad6. This port address can not be changed. -# The irq values may only be 10, 11, or 15 -# I/O memory is an 8kb region. Possible values are: -# 0a0000, 0a2000, ..., 0fffff, f00000, f02000, ..., ffffff -# The start address must be on an even boundary. -# Add the following option if you want to allow non-root users to be able -# to access the spigot. This option is not secure because it allows users -# direct access to the I/O page. -# options SPIGOT_UNSECURE - # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. # The Rev 1 host cards use a 64K chunk, on a 32K boundary. @@ -671,16 +644,12 @@ # is the only thing truly supported, but apparently a fair percentage # of the Vaio extra features are controlled by this device. -device spigot 1 -hint.spigot.0.at="isa" -hint.spigot.0.port="0xad6" -hint.spigot.0.irq="15" -hint.spigot.0.maddr="0xee000" device apm hint.apm.0.flags="0x20" device pmtimer # Adjust system timer at wakeup time -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#The Cy driver is commented out until imp can move it to dev/cy +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared hint.cy.0.at="isa" hint.cy.0.irq="10" hint.cy.0.maddr="0xd4000" @@ -697,10 +666,6 @@ device digi_Xe device digi_Xem device digi_Xr -device gsc 1 -hint.gsc.0.at="isa" -hint.gsc.0.port="0x270" -hint.gsc.0.drq="3" device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" ==== //depot/projects/netperf_socket/sys/i386/isa/pcf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/pcf.c,v 1.21 2003/06/20 07:22:54 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/pcf.c,v 1.22 2004/03/14 23:03:57 imp Exp $"); #include #include @@ -40,8 +40,6 @@ #include #include -#include - #include #include "iicbus_if.h" ==== //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.53 2004/01/24 21:48:43 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.54 2004/03/14 15:23:05 phk Exp $"); #include "opt_ntp.h" @@ -50,10 +50,10 @@ /* * Single-precision macros for 64-bit machines */ -typedef long long l_fp; +typedef int64_t l_fp; #define L_ADD(v, u) ((v) += (u)) #define L_SUB(v, u) ((v) -= (u)) -#define L_ADDHI(v, a) ((v) += (long long)(a) << 32) +#define L_ADDHI(v, a) ((v) += (int64_t)(a) << 32) #define L_NEG(v) ((v) = -(v)) #define L_RSHIFT(v, n) \ do { \ @@ -65,7 +65,7 @@ #define L_MPY(v, a) ((v) *= (a)) #define L_CLR(v) ((v) = 0) #define L_ISNEG(v) ((v) < 0) -#define L_LINT(v, a) ((v) = (long long)(a) << 32) +#define L_LINT(v, a) ((v) = (int64_t)(a) << 32) #define L_GINT(v) ((v) < 0 ? -(-(v) >> 32) : (v) >> 32) /* @@ -357,8 +357,13 @@ L_LINT(time_freq, MAXFREQ); else if (freq < -MAXFREQ) L_LINT(time_freq, -MAXFREQ); - else - L_LINT(time_freq, freq); + else { + /* + * ntv.freq is [PPM * 2^16] = [us/s * 2^16] + * time_freq is [ns/s * 2^32] + */ + time_freq = ntv.freq * 1000LL * 65536LL; + } #ifdef PPS_SYNC pps_freq = time_freq; #endif /* PPS_SYNC */ @@ -548,10 +553,8 @@ tickrate = 500; else if (time_adjtime < -500) tickrate = -500; - else if (time_adjtime != 0) + else tickrate = time_adjtime; - else - tickrate = 0; /* GCC sucks! */ time_adjtime -= tickrate; L_LINT(ftemp, tickrate * 1000); L_ADD(time_adj, ftemp); ==== //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.152 2004/03/05 22:03:11 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.153 2004/03/15 06:42:40 truckman Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1000,8 +1000,7 @@ error = sysctl_root(0, name, namelen, &req); if (req.lock == REQ_WIRED) - vsunlock(req.td, (vm_offset_t)req.oldptr, - (vm_size_t)req.wiredlen); + vsunlock(req.oldptr, req.wiredlen); SYSCTL_UNLOCK(); @@ -1103,8 +1102,7 @@ ret = 0; if (req->lock == REQ_LOCKED && req->oldptr && req->oldfunc == sysctl_old_user) { - ret = vslock(req->td, (vm_offset_t)req->oldptr, - (vm_size_t)wiredlen); + ret = vslock(req->oldptr, wiredlen); if (ret == 0) { req->lock = REQ_WIRED; req->wiredlen = wiredlen; @@ -1320,8 +1318,7 @@ req = req2; if (req.lock == REQ_WIRED) - vsunlock(req.td, (vm_offset_t)req.oldptr, - (vm_size_t)req.wiredlen); + vsunlock(req.oldptr, req.wiredlen); SYSCTL_UNLOCK(); ==== //depot/projects/netperf_socket/sys/net/if_tap.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tap.c,v 1.38 2004/03/11 12:58:55 phk Exp $ + * $FreeBSD: src/sys/net/if_tap.c,v 1.39 2004/03/15 01:52:00 rwatson Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -108,6 +108,12 @@ .d_name = CDEV_NAME, }; +/* + * All global variables in if_tap.c are locked with tapmtx, with the + * exception of tapdebug, which is accessed unlocked; tapclones is + * static at runtime. + */ +static struct mtx tapmtx; static int tapdebug = 0; /* debug flag */ static SLIST_HEAD(, tap_softc) taphead; /* first device */ static struct clonedevs *tapclones; @@ -138,23 +144,38 @@ /* intitialize device */ + mtx_init(&tapmtx, "tapmtx", NULL, MTX_DEF); SLIST_INIT(&taphead); clone_setup(&tapclones); eh_tag = EVENTHANDLER_REGISTER(dev_clone, tapclone, 0, 1000); - if (eh_tag == NULL) + if (eh_tag == NULL) { + mtx_destroy(&tapmtx); return (ENOMEM); + } return (0); case MOD_UNLOAD: - SLIST_FOREACH(tp, &taphead, tap_next) - if (tp->tap_flags & TAP_OPEN) + /* + * The EBUSY algorithm here can't quite atomically + * guarantee that this is race-free since we have to + * release the tap mtx to deregister the clone handler. + */ + mtx_lock(&tapmtx); + SLIST_FOREACH(tp, &taphead, tap_next) { + if (tp->tap_flags & TAP_OPEN) { + mtx_unlock(&tapmtx); return (EBUSY); + } + } + mtx_unlock(&tapmtx); EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); + mtx_lock(&tapmtx); while ((tp = SLIST_FIRST(&taphead)) != NULL) { SLIST_REMOVE_HEAD(&taphead, tap_next); + mtx_unlock(&tapmtx); ifp = &tp->tap_if; @@ -169,7 +190,9 @@ splx(s); free(tp, M_TAP); + mtx_lock(&tapmtx); } + mtx_unlock(&tapmtx); clone_cleanup(&tapclones); break; @@ -246,7 +269,9 @@ /* allocate driver storage and create device */ MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO); + mtx_lock(&tapmtx); SLIST_INSERT_HEAD(&taphead, tp, tap_next); + mtx_unlock(&tapmtx); unit = dev2unit(dev); ==== //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.243 2004/03/07 04:07:57 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.244 2004/03/15 00:49:40 obrien Exp $ machine pc98 #cpu I386_CPU # Do not enable with other cpu types @@ -186,7 +186,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.16 2002/12/03 20:20:44 sos Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.17 2004/03/14 23:02:07 imp Exp $ hint.atacbus.0.at="isa" hint.atacbus.0.port="0x640" @@ -17,17 +17,17 @@ hint.fd.3.at="fdc0" hint.fd.3.drive="3" -hint.wdc.0.at="isa" -hint.wdc.0.port="0x640" -hint.wdc.0.irq="9" -hint.wd.0.at="wdc0" -hint.wd.0.drive="0" -hint.wd.1.at="wdc0" -hint.wd.1.drive="2" -hint.wd.2.at="wdc0" -hint.wd.2.drive="1" -hint.wd.3.at="wdc0" -hint.wd.3.drive="3" +#hint.wdc.0.at="isa" +#hint.wdc.0.port="0x640" +#hint.wdc.0.irq="9" +#hint.wd.0.at="wdc0" +#hint.wd.0.drive="0" +#hint.wd.1.at="wdc0" +#hint.wd.1.drive="2" +#hint.wd.2.at="wdc0" +#hint.wd.2.drive="1" +#hint.wd.3.at="wdc0" +#hint.wd.3.drive="3" # PC-9801-100 hint.aic.0.at="isa" @@ -36,11 +36,11 @@ hint.aic.0.flags="0x10000" # PC-9801-92 -hint.bs.0.at="isa" -hint.bs.0.port="0xCC0" -hint.bs.0.irq="5" -hint.bs.0.drq="3" -hint.bs.0.flags="0" +#hint.bs.0.at="isa" +#hint.bs.0.port="0xCC0" +#hint.bs.0.irq="5" +#hint.bs.0.drq="3" +#hint.bs.0.flags="0" # SC-98 #hint.bs.0.at="isa" #hint.bs.0.port="0xCC0" ==== //depot/projects/netperf_socket/sys/pc98/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.27 2004/03/07 05:38:20 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.29 2004/03/15 10:39:37 imp Exp $ # # @@ -264,7 +264,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options COMPAT_OLDISA #Use ISA shims and glue for old drivers options AUTO_EOI_1 options MAXMEM=(128*1024) @@ -459,28 +458,11 @@ # pmtimer: Timer device driver for power management events (APM or ACPI) # cy: Cyclades serial driver # digi: Digiboard driver -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on APM # The flags takes the following meaning for apm0: # 0x0020 Statclock is broken. -# Notes on the Stallion stl and stli drivers: -# See src/i386/isa/README.stl for complete instructions. -# This is version 0.0.5alpha, unsupported by Stallion. -# The stl driver has a secondary IO port hard coded at 0x280. You need -# to change src/i386/isa/stallion.c if you reconfigure this on the boards. -# The "flags" and "msize" settings on the stli driver depend on the board: -# EasyConnection 8/64 ISA: flags 23 msize 0x1000 -# EasyConnection 8/64 EISA: flags 24 msize 0x10000 -# EasyConnection 8/64 MCA: flags 25 msize 0x1000 -# ONboard ISA: flags 4 msize 0x10000 -# ONboard EISA: flags 7 msize 0x10000 -# ONboard MCA: flags 3 msize 0x10000 -# Brumby: flags 2 msize 0x4000 -# Stallion: flags 1 msize 0x10000 - device apm hint.apm.0.flags="0x20" device canbus @@ -489,8 +471,8 @@ hint.pmc.0.at="isa" hint.pmc.0.port="0x8f0" device pmtimer # Adjust system timer at wakeup time -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi # BIOS & FEP/OS components of device digi. device digi_CX @@ -503,8 +485,6 @@ device olpt hint.olpt.0.at="isa" hint.olpt.0.port="0x040" -device stl -device stli # # Laptop/Notebook options: ==== //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.134 2003/11/04 13:15:12 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.135 2004/03/15 10:39:01 imp Exp $ */ /* @@ -85,7 +85,6 @@ #include #include #include -#include #ifdef DEV_ISA #include #endif ==== //depot/projects/netperf_socket/sys/vm/vm_extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_extern.h,v 1.70 2004/03/05 22:03:11 truckman Exp $ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.71 2004/03/15 06:42:40 truckman Exp $ */ #ifndef _VM_EXTERN_H_ @@ -86,8 +86,8 @@ void vmspace_free(struct vmspace *); void vmspace_exitfree(struct proc *); void vnode_pager_setsize(struct vnode *, vm_ooffset_t); -int vslock(struct thread *, vm_offset_t, vm_size_t); -int vsunlock(struct thread *, vm_offset_t, vm_size_t); +int vslock(void *, size_t); +void vsunlock(void *, size_t); void vm_object_print(/* db_expr_t */ long, boolean_t, /* db_expr_t */ long, char *); int vm_fault_quick(caddr_t v, int prot); ==== //depot/projects/netperf_socket/sys/vm/vm_glue.c#5 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.192 2004/03/07 21:06:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.195 2004/03/15 09:11:23 truckman Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -183,39 +183,29 @@ return (rv == TRUE); } -/* - * MPSAFE - */ int -vslock(td, addr, size) - struct thread *td; - vm_offset_t addr; - vm_size_t size; +vslock(void *addr, size_t len) { - vm_offset_t start, end; - struct proc *proc = td->td_proc; - int error, npages; + vm_offset_t end, last, start; + vm_size_t npages; + int error; - start = trunc_page(addr); - end = round_page(addr + size); - - /* disable wrap around */ - if (end <= start) + last = (vm_offset_t)addr + len; + start = trunc_page((vm_offset_t)addr); + end = round_page(last); + if (last < (vm_offset_t)addr || end < (vm_offset_t)addr) return (EINVAL); - npages = atop(end - start); - if (npages > vm_page_max_wired) return (ENOMEM); - - PROC_LOCK(proc); - if (npages + pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map)) > - atop(lim_cur(proc, RLIMIT_MEMLOCK))) { - PROC_UNLOCK(proc); + PROC_LOCK(curproc); + if (ptoa(npages + + pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))) > + lim_cur(curproc, RLIMIT_MEMLOCK)) { + PROC_UNLOCK(curproc); return (ENOMEM); } - PROC_UNLOCK(proc); - + PROC_UNLOCK(curproc); #if 0 /* * XXX - not yet @@ -229,36 +219,23 @@ if (npages + cnt.v_wire_count > vm_page_max_wired) return (EAGAIN); #endif - - error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, - VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); - - /* EINVAL is probably a better error to return than ENOMEM */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 15 10:22:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADD0F16A4FB; Mon, 15 Mar 2004 10:22:31 -0800 (PST) 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 805AB16A4D3 for ; Mon, 15 Mar 2004 10:22:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78F7A43D48 for ; Mon, 15 Mar 2004 10:22:31 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2FIMVGe042648 for ; Mon, 15 Mar 2004 10:22:31 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2FIMU7K042634 for perforce@freebsd.org; Mon, 15 Mar 2004 10:22:30 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 15 Mar 2004 10:22:30 -0800 (PST) Message-Id: <200403151822.i2FIMU7K042634@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 Subject: PERFORCE change 49033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 18:22:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=49033 Change 49033 by jhb@jhb_slimer on 2004/03/15 10:21:45 Need sched.h for pinning functions. Reported by: wilko Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#25 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#25 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -133,7 +134,7 @@ alpha_clock_interrupt(framep); break; - case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ + case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ a0 = alpha_pal_rdmces(); if (platform.mcheck_handler) (*platform.mcheck_handler)(a0, framep, a1, a2); From owner-p4-projects@FreeBSD.ORG Mon Mar 15 11:56:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E77416A4CF; Mon, 15 Mar 2004 11:56:30 -0800 (PST) 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 B924916A4D1 for ; Mon, 15 Mar 2004 11:56:29 -0800 (PST) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82AF243D49 for ; Mon, 15 Mar 2004 11:56:29 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 24268 invoked from network); 15 Mar 2004 19:56:28 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 15 Mar 2004 19:56:28 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i2FJt42F059716; Mon, 15 Mar 2004 14:56:25 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Juli Mallett Date: Mon, 15 Mar 2004 11:47:41 -0500 User-Agent: KMail/1.6 References: <200403130837.i2D8b9wv054555@repoman.freebsd.org> In-Reply-To: <200403130837.i2D8b9wv054555@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200403151147.41616.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 48876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2004 19:56:30 -0000 On Saturday 13 March 2004 03:37 am, Juli Mallett wrote: > ==== //depot/projects/mips/sys/mips/mips/trap.c#17 (text+ko) ==== > > @@ -40,6 +40,7 @@ > #include > #include > #include > +#include > > #ifdef DDB > #include > @@ -108,6 +109,12 @@ > tlb_modified(badvaddr); > platform_trap_exit(); > return; > + case TrInt: > + platform_trap_exit(); > + atomic_add_int(&curthread->td_intr_nesting_level, 1); > + platform_intr(tf); > + atomic_subtract_int(&curthread->td_intr_nesting_level, 1); > + return; > default: > /* Fatal! */ > break; Note that if interrupts are disabled on the CPU when this is called, you don't need to use atomic ops to dink with the nesting level. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Mar 16 07:43:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7497716A4E2; Tue, 16 Mar 2004 07:43:36 -0800 (PST) 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 4D04516A4E1 for ; Tue, 16 Mar 2004 07:43:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47D9843D1D for ; Tue, 16 Mar 2004 07:43:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GFhaGe061377 for ; Tue, 16 Mar 2004 07:43:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GFhZtQ061373 for perforce@freebsd.org; Tue, 16 Mar 2004 07:43:35 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 16 Mar 2004 07:43:35 -0800 (PST) Message-Id: <200403161543.i2GFhZtQ061373@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 Subject: PERFORCE change 49092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 15:43:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=49092 Change 49092 by jhb@jhb_slimer on 2004/03/16 07:43:22 Update. Affected files ... .. //depot/projects/smpng/sys/notes#11 edit Differences ... ==== //depot/projects/smpng/sys/notes#11 (text+ko) ==== @@ -1,6 +1,8 @@ This file serves as a sort of todo list for this branch as well as documenting what patches currently live in this branch. +- Fix alpha ithread preemption on SMP by pinning interrupted threads + - Waiting for SMP testing feedback - Consolidate linux module version and dependencies into MI location. - Untested - Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead From owner-p4-projects@FreeBSD.ORG Tue Mar 16 09:38:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DC1D16A4D0; Tue, 16 Mar 2004 09:38:01 -0800 (PST) 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 4C81816A4CE for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 421CA43D2F for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GHc1Ge093673 for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GHbuGu093666 for perforce@freebsd.org; Tue, 16 Mar 2004 09:37:56 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 16 Mar 2004 09:37:56 -0800 (PST) Message-Id: <200403161737.i2GHbuGu093666@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 Subject: PERFORCE change 49097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 17:38:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=49097 Change 49097 by jhb@jhb_slimer on 2004/03/16 09:37:40 IFC @49096. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#21 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#11 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#9 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#9 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#10 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/smpng/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/smpng/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#21 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#7 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#17 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/smpng/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/smpng/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/smpng/sys/conf/NOTES#64 integrate .. //depot/projects/smpng/sys/conf/files#106 integrate .. //depot/projects/smpng/sys/conf/files.i386#56 integrate .. //depot/projects/smpng/sys/conf/files.pc98#54 integrate .. //depot/projects/smpng/sys/conf/kern.mk#11 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#31 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#29 integrate .. //depot/projects/smpng/sys/conf/options#72 integrate .. //depot/projects/smpng/sys/conf/options.amd64#7 integrate .. //depot/projects/smpng/sys/conf/options.i386#41 integrate .. //depot/projects/smpng/sys/conf/options.pc98#38 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#7 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#37 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#40 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#15 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/smpng/sys/dev/ct/bshw_machdep.c#4 integrate .. //depot/projects/smpng/sys/dev/ct/ct.c#5 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#19 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#14 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#10 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#48 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#14 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#6 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#9 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#21 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#19 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#13 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/md/md.c#47 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#3 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#15 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#6 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#29 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#18 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#7 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_acctrace.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_alloclist.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_aselect.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_callback.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_chaindecluster.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_copyback.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_cvscan.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegrd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegwr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffrd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffwr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagfuncs.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagutils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugMem.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugprint.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_decluster.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_declusterPQ.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_disks.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_driver.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_engine.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dagfuncs.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_fifo.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#14 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_geniq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_interdecluster.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_invertq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_layout.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_map.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_mcpair.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_memchunk.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_nwayxor.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_options.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogDiskMgr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogging.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityloggingdags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityscan.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdeg.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdegdags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_psstatus.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid0.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid1.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid4.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5_rotatedspare.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconbuffer.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconmap.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconstruct.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconutil.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_revent.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_shutdown.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_sstf.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_states.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_stripelocks.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_strutils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_threadstuff.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_threadstuff.h#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_types.h#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_utils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/smpng/sys/dev/re/if_re.c#7 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#13 integrate .. //depot/projects/smpng/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#14 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#15 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#7 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#16 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#48 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#48 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#20 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#18 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#14 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#17 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#17 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#39 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#12 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#30 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#19 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#23 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#47 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#79 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#68 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#49 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#5 integrate .. //depot/projects/smpng/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/smpng/sys/i386/include/atomic.h#12 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#10 integrate .. //depot/projects/smpng/sys/i386/include/cdk.h#2 delete .. //depot/projects/smpng/sys/i386/include/cpufunc.h#26 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#7 integrate .. //depot/projects/smpng/sys/i386/include/dvcfg.h#3 delete .. //depot/projects/smpng/sys/i386/include/endian.h#13 integrate .. //depot/projects/smpng/sys/i386/include/gsc.h#2 delete .. //depot/projects/smpng/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/smpng/sys/i386/include/in_cksum.h#5 integrate .. //depot/projects/smpng/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/smpng/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/smpng/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#11 integrate .. //depot/projects/smpng/sys/i386/include/physio_proc.h#5 delete .. //depot/projects/smpng/sys/i386/include/profile.h#9 integrate .. //depot/projects/smpng/sys/i386/include/spigot.h#2 delete .. //depot/projects/smpng/sys/i386/include/stdarg.h#9 integrate .. //depot/projects/smpng/sys/i386/include/wtio.h#2 delete .. //depot/projects/smpng/sys/i386/isa/README.le#2 delete .. //depot/projects/smpng/sys/i386/isa/README.stl#2 delete .. //depot/projects/smpng/sys/i386/isa/asc.c#9 delete .. //depot/projects/smpng/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ctx.c#9 delete .. //depot/projects/smpng/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gpib.c#10 delete .. //depot/projects/smpng/sys/i386/isa/gpib.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gsc.c#8 delete .. //depot/projects/smpng/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ic/lemac.h#3 delete .. //depot/projects/smpng/sys/i386/isa/if_el.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/if_le.c#13 delete .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#11 delete .. //depot/projects/smpng/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/isa_compat.c#6 delete .. //depot/projects/smpng/sys/i386/isa/isa_device.h#5 delete .. //depot/projects/smpng/sys/i386/isa/istallion.c#12 delete .. //depot/projects/smpng/sys/i386/isa/npx.c#39 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#16 delete .. //depot/projects/smpng/sys/i386/isa/stallion.c#14 delete .. //depot/projects/smpng/sys/i386/isa/wt.c#10 delete .. //depot/projects/smpng/sys/i386/isa/wtreg.h#3 delete .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#79 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#24 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#53 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#63 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#32 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#34 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#41 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#42 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#43 integrate .. //depot/projects/smpng/sys/libkern/quad.h#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#72 integrate .. //depot/projects/smpng/sys/modules/arl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/raidframe/Makefile#3 delete .. //depot/projects/smpng/sys/net/if.c#45 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#44 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#15 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_tap.c#25 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#4 integrate .. //depot/projects/smpng/sys/net/if_tun.c#30 integrate .. //depot/projects/smpng/sys/net/if_var.h#22 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_ioctl.h#5 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#22 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.c#6 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#31 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#41 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#7 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#23 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#14 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#52 integrate .. //depot/projects/smpng/sys/pci/if_de.c#14 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#23 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#45 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#25 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#38 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#29 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#27 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#35 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#20 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#23 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#22 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#41 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#15 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#23 integrate .. //depot/projects/smpng/sys/sys/assym.h#2 integrate .. //depot/projects/smpng/sys/sys/ata.h#17 integrate .. //depot/projects/smpng/sys/sys/buf.h#26 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#23 integrate .. //depot/projects/smpng/sys/sys/conf.h#25 integrate .. //depot/projects/smpng/sys/sys/dir.h#2 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#20 integrate .. //depot/projects/smpng/sys/sys/ioctl.h#3 integrate .. //depot/projects/smpng/sys/sys/limits.h#6 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#26 integrate .. //depot/projects/smpng/sys/sys/param.h#59 integrate .. //depot/projects/smpng/sys/sys/queue.h#9 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/smpng/sys/sys/socket.h#18 integrate .. //depot/projects/smpng/sys/sys/syscall.h#41 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#41 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#27 integrate .. //depot/projects/smpng/sys/sys/syslimits.h#7 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#43 integrate .. //depot/projects/smpng/sys/sys/vnode.h#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#31 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#42 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/smpng/sys/alpha/linux/linux_proto.h#11 (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.15 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.16 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#9 (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.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#9 (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.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #include "opt_compat.h" @@ -24,7 +24,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = */ { AS(linux_link_args), (sy_call_t *)linux_link }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink }, /* 10 = linux_unlink */ ==== //depot/projects/smpng/sys/alpha/linux/syscalls.master#10 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -43,7 +43,7 @@ 4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } 5 UNIMPL 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL 9 STD { int linux_link(char *path, char *to); } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.9 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.10 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #ifndef _OSF1_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #define OSF1_SYS_nosys 0 ==== //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #include "opt_compat.h" @@ -25,7 +25,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = old open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link }, /* 9 = link */ { AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ ==== //depot/projects/smpng/sys/alpha/osf1/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp $ +; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from OSF1). @@ -37,7 +37,7 @@ 4 MNOPROTO { ssize_t write(int fd, char *buf, ssize_t nbyte); } 5 UNIMPL old open 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL old creat 9 NOPROTO { int link(char *path, char *link); } ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -629,10 +629,6 @@ printf("Idle\n"); } -#ifdef KDB - if (kdb_trap(&psl)) - return; -#endif #ifdef DDB if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) return; @@ -758,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -773,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -811,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#14 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.403 2004/02/02 00:54:59 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.404 2004/03/15 00:49:39 obrien Exp $ machine amd64 cpu HAMMER @@ -188,7 +188,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/smpng/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/smpng/sys/amd64/include/cpufunc.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.141 2004/03/08 00:24:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.142 2004/03/11 13:38:54 bde Exp $ */ /* @@ -119,6 +119,8 @@ __asm __volatile("sti"); } +#ifdef _KERNEL + #define HAVE_INLINE_FFS static __inline int @@ -162,6 +164,8 @@ return (mask == 0 ? mask : (int)bsrq((u_long)mask) + 1); } +#endif /* _KERNEL */ + static __inline void halt(void) { ==== //depot/projects/smpng/sys/amd64/include/pci_cfgreg.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/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -42,9 +41,6 @@ #include #include #include -#include -#include -#include #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 16 13:30:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D434B16A4D0; Tue, 16 Mar 2004 13:30:29 -0800 (PST) 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 A2F9316A4CE for ; Tue, 16 Mar 2004 13:30:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61DF943D41 for ; Tue, 16 Mar 2004 13:30:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GLUTGe051837 for ; Tue, 16 Mar 2004 13:30:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GLUQWX051825 for perforce@freebsd.org; Tue, 16 Mar 2004 13:30:26 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 16 Mar 2004 13:30:26 -0800 (PST) Message-Id: <200403162130.i2GLUQWX051825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 21:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=49118 Change 49118 by peter@peter_daintree on 2004/03/16 13:29:52 IFC @49115 Affected files ... .. //depot/projects/hammer/Makefile.inc1#43 integrate .. //depot/projects/hammer/bin/kill/kill.c#4 integrate .. //depot/projects/hammer/bin/pax/cache.c#4 integrate .. //depot/projects/hammer/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#9 integrate .. //depot/projects/hammer/etc/Makefile#24 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#22 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#19 integrate .. //depot/projects/hammer/etc/rc.d/mixer#1 branch .. //depot/projects/hammer/etc/rc.d/named#6 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk#1 branch .. //depot/projects/hammer/games/number/number.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#7 integrate .. //depot/projects/hammer/include/resolv.h#5 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.c#5 integrate .. //depot/projects/hammer/lib/libc/net/res_send.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getwc.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/putwc.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.3#3 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#5 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#9 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#14 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#12 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#12 integrate .. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#6 integrate .. //depot/projects/hammer/libexec/getty/chat.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#47 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#59 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#15 integrate .. //depot/projects/hammer/sbin/Makefile#24 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#14 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#4 integrate .. //depot/projects/hammer/sbin/raidctl/Makefile#2 delete .. //depot/projects/hammer/sbin/raidctl/raidctl.8#5 delete .. //depot/projects/hammer/sbin/raidctl/raidctl.c#3 delete .. //depot/projects/hammer/sbin/raidctl/rf_configure.c#3 delete .. //depot/projects/hammer/share/man/man4/Makefile#37 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#16 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/asc.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/gsc.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/le.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/rdp.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/hammer/share/man/man4/raid.4#5 delete .. //depot/projects/hammer/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/hammer/share/man/man9/vslock.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#16 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#10 integrate .. //depot/projects/hammer/share/syscons/keymaps/ru.koi8-r.win.kbd#1 branch .. //depot/projects/hammer/share/termcap/termcap.src#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#6 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#6 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#31 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#36 integrate .. //depot/projects/hammer/sys/conf/files#49 integrate .. //depot/projects/hammer/sys/conf/files.i386#24 integrate .. //depot/projects/hammer/sys/conf/files.pc98#24 integrate .. //depot/projects/hammer/sys/conf/options#33 integrate .. //depot/projects/hammer/sys/conf/options.i386#25 integrate .. //depot/projects/hammer/sys/conf/options.pc98#20 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#15 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#28 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#14 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#11 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#7 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#28 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#9 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#9 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#13 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#13 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#12 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_acctrace.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_alloclist.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_aselect.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_callback.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_chaindecluster.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_copyback.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_cvscan.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegrd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegwr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffrd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffwr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagfuncs.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagutils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugMem.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugprint.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_declusterPQ.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_diskqueue.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_disks.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_driver.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_engine.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dagfuncs.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_fifo.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#9 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_geniq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_interdecluster.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_invertq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_layout.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_map.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_mcpair.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_memchunk.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_nwayxor.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_options.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylog.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogDiskMgr.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogging.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityloggingdags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityscan.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pq.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdeg.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdegdags.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_psstatus.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid0.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid1.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid4.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5_rotatedspare.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconbuffer.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconmap.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconstruct.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconutil.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_revent.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_shutdown.c#4 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_sstf.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_states.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_stripelocks.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_strutils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_threadstuff.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_threadstuff.h#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_types.h#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_utils.c#3 delete .. //depot/projects/hammer/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/hammer/sys/dev/re/if_re.c#10 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#10 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#12 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#7 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#13 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#30 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#30 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#10 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#11 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#9 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#36 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/hammer/sys/i386/include/cdk.h#2 delete .. //depot/projects/hammer/sys/i386/include/gsc.h#2 delete .. //depot/projects/hammer/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/hammer/sys/i386/include/spigot.h#2 delete .. //depot/projects/hammer/sys/i386/include/wtio.h#2 delete .. //depot/projects/hammer/sys/i386/isa/README.le#2 delete .. //depot/projects/hammer/sys/i386/isa/README.stl#2 delete .. //depot/projects/hammer/sys/i386/isa/asc.c#6 delete .. //depot/projects/hammer/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ctx.c#6 delete .. //depot/projects/hammer/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gpib.c#7 delete .. //depot/projects/hammer/sys/i386/isa/gpib.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/gsc.c#5 delete .. //depot/projects/hammer/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/hammer/sys/i386/isa/ic/lemac.h#2 delete .. //depot/projects/hammer/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#10 delete .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#12 delete .. //depot/projects/hammer/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/isa_compat.c#6 delete .. //depot/projects/hammer/sys/i386/isa/isa_device.h#3 delete .. //depot/projects/hammer/sys/i386/isa/istallion.c#6 delete .. //depot/projects/hammer/sys/i386/isa/pcf.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/spigot.c#7 delete .. //depot/projects/hammer/sys/i386/isa/stallion.c#8 delete .. //depot/projects/hammer/sys/i386/isa/wt.c#7 delete .. //depot/projects/hammer/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#16 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#12 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#26 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#27 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/hammer/sys/modules/Makefile#38 integrate .. //depot/projects/hammer/sys/modules/arl/Makefile#1 branch .. //depot/projects/hammer/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/raidframe/Makefile#3 delete .. //depot/projects/hammer/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/hammer/sys/net/if_tap.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#11 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#30 integrate .. //depot/projects/hammer/sys/pci/if_de.c#12 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#16 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#29 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#17 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#23 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#21 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#17 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#18 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#15 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#16 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#16 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#31 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/hammer/sys/sys/ata.h#7 integrate .. //depot/projects/hammer/sys/sys/limits.h#7 integrate .. //depot/projects/hammer/sys/sys/mount.h#13 integrate .. //depot/projects/hammer/sys/sys/sf_buf.h#3 integrate .. //depot/projects/hammer/sys/sys/syscall.h#26 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#26 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#14 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#26 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#10 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#25 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#19 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/current.rc#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#8 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#18 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#11 integrate .. //depot/projects/hammer/usr.bin/Makefile#26 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#17 integrate .. //depot/projects/hammer/usr.bin/finger/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/finger/finger.c#5 integrate .. //depot/projects/hammer/usr.bin/finger/finger.h#2 integrate .. //depot/projects/hammer/usr.bin/finger/lprint.c#4 integrate .. //depot/projects/hammer/usr.bin/mkstr/mkstr.c#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.c#3 integrate .. //depot/projects/hammer/usr.bin/sasc/INSTALL#2 delete .. //depot/projects/hammer/usr.bin/sasc/Makefile#2 delete .. //depot/projects/hammer/usr.bin/sasc/README#2 delete .. //depot/projects/hammer/usr.bin/sasc/sasc.1#2 delete .. //depot/projects/hammer/usr.bin/sasc/sasc.c#2 delete .. //depot/projects/hammer/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/hammer/usr.sbin/Makefile#45 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.8#7 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#4 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.8#1 branch .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.c#1 branch .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/hammer/usr.sbin/sgsc/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/sgsc/sgsc.1#2 delete .. //depot/projects/hammer/usr.sbin/sgsc/sgsc.c#2 delete .. //depot/projects/hammer/usr.sbin/stallion/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/Makefile.inc#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/2681.sys.uu#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/cdk.sys.uu#2 delete .. //depot/projects/hammer/usr.sbin/stallion/bootcode/stl.4#3 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/stlload.8#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlload/stlload.c#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/stlstats.8#2 delete .. //depot/projects/hammer/usr.sbin/stallion/stlstats/stlstats.c#3 delete .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#13 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -261,7 +261,7 @@ mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include + -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo ==== //depot/projects/hammer/bin/kill/kill.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.17 2004/01/28 19:04:14 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.18 2004/03/15 04:10:29 jmallett Exp $"); #include #include @@ -53,10 +53,10 @@ #include #include -void nosig(char *); -void printsignals(FILE *); -int signame_to_signum(char *); -void usage(void); +static void nosig(const char *); +static void printsignals(FILE *); +static int signame_to_signum(const char *); +static void usage(void); int main(int argc, char *argv[]) @@ -139,8 +139,8 @@ exit(errors); } -int -signame_to_signum(char *sig) +static int +signame_to_signum(const char *sig) { int n; @@ -153,8 +153,8 @@ return (-1); } -void -nosig(char *name) +static void +nosig(const char *name) { warnx("unknown signal %s; valid signals:", name); @@ -162,7 +162,7 @@ exit(1); } -void +static void printsignals(FILE *fp) { int n; @@ -176,7 +176,7 @@ } } -void +static void usage(void) { ==== //depot/projects/hammer/bin/pax/cache.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.19 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.20 2004/03/16 08:33:33 cperciva Exp $"); #include #include @@ -203,7 +203,7 @@ ++pwopn; } if (ptr == NULL) - ptr = (UIDC *)malloc(sizeof(UIDC)); + ptr = uidtb[uid % UID_SZ] = (UIDC *)malloc(sizeof(UIDC)); if ((pw = getpwuid(uid)) == NULL) { /* @@ -274,7 +274,7 @@ ++gropn; } if (ptr == NULL) - ptr = (GIDC *)malloc(sizeof(GIDC)); + ptr = gidtb[gid % GID_SZ] = (GIDC *)malloc(sizeof(GIDC)); if ((gr = getgrgid(gid)) == NULL) { /* ==== //depot/projects/hammer/contrib/pf/authpf/authpf.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: authpf.c,v 1.68 2003/08/21 19:13:23 frantzen Exp $ */ /* @@ -26,7 +25,10 @@ * SUCH DAMAGE. */ -#include +#include +__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + +#include #include #include #include @@ -50,9 +52,6 @@ #include "pathnames.h" -#if defined(__FreeBSD__) -#define __dead __volatile -#endif extern int symset(const char *, const char *, int); static int read_config(FILE *); @@ -77,7 +76,11 @@ volatile sig_atomic_t want_death; static void need_death(int signo); +#ifdef __FreeBSD__ +static __dead2 void do_death(int); +#else static __dead void do_death(int); +#endif /* * User shell for authenticating gateways. Sole purpose is to allow @@ -289,9 +292,8 @@ sleep(180); /* them lusers read reaaaaal slow */ die: do_death(0); -#if defined(__FreeBSD__) - return 0; /* gcc hack to prevent warning */ -#endif + + /* NOTREACHED */ } /* @@ -730,7 +732,11 @@ /* * function that removes our stuff when we go away. */ +#ifdef __FreeBSD__ +static __dead2 void +#else static __dead void +#endif do_death(int active) { int ret = 0; ==== //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: ftp-proxy.c,v 1.33 2003/08/22 21:50:34 david Exp $ */ /* @@ -31,6 +30,9 @@ * */ +#include +__FBSDID("$FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + /* * ftp proxy, Originally based on juniper_ftp_proxy from the Obtuse * Systems juniper firewall, written by Dan Boulet @@ -69,7 +71,6 @@ */ #include -#include #include #include ==== //depot/projects/hammer/contrib/pf/pfctl/parse.y#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -26,6 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ %{ +#include +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.5 2004/03/16 17:24:06 obrien Exp $"); + #include #include #include @@ -49,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -56,7 +59,7 @@ #include "pfctl_parser.h" #include "pfctl.h" -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #define HTONL(x) (x) = htonl((__uint32_t)(x)) #endif ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl.c,v 1.188 2003/08/29 21:47:36 cedric Exp $ */ /* @@ -31,18 +30,15 @@ * */ +#include +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include #include #include #include #include -#if defined(__FreeBSD__) -#include -#include -#else -#define PRIu64 "llu" -#endif #include #include #include @@ -201,7 +197,7 @@ if (ioctl(dev, DIOCSTART)) { if (errno == EEXIST) errx(1, "pf already enabled"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ else if (errno == ESRCH) errx(1, "pfil registeration failed"); #endif @@ -554,10 +550,11 @@ rule->qname, rule->qid, rule->pqname, rule->pqid); } if (opts & PF_OPT_VERBOSE) - printf(" [ Evaluations: %-8"PRIu64" Packets: %-8"PRIu64" " - "Bytes: %-10"PRIu64" States: %-6u]\n", - rule->evaluations, rule->packets, - rule->bytes, rule->states); + printf(" [ Evaluations: %-8llu Packets: %-8llu " + "Bytes: %-10llu States: %-6u]\n", + (unsigned long long)rule->evaluations, + (unsigned long long)rule->packets, + (unsigned long long)rule->bytes, rule->states); } int @@ -619,9 +616,10 @@ case 1: if (pr.rule.label[0]) { printf("%s ", pr.rule.label); - printf("%"PRIu64" %"PRIu64" %"PRIu64"\n", - pr.rule.evaluations, pr.rule.packets, - pr.rule.bytes); + printf("%llu %llu %llu\n", + (unsigned long long)pr.rule.evaluations, + (unsigned long long)pr.rule.packets, + (unsigned long long)pr.rule.bytes); } break; default: @@ -651,9 +649,10 @@ case 1: if (pr.rule.label[0]) { printf("%s ", pr.rule.label); - printf("%"PRIu64" %"PRIu64" %"PRIu64"\n", - pr.rule.evaluations, pr.rule.packets, - pr.rule.bytes); + printf("%llu %llu %llu\n", + (unsigned long long)pr.rule.evaluations, + (unsigned long long)pr.rule.packets, + (unsigned long long)pr.rule.bytes); } break; default: ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl.h,v 1.25 2003/08/29 21:47:36 cedric Exp $ */ /* @@ -29,6 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.4 2004/03/16 17:24:06 obrien Exp $ */ #ifndef _PFCTL_H_ @@ -83,7 +83,7 @@ int pfctl_show_altq(int, int, int); void warn_namespace_collision(const char *); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ extern int altqsupport; #endif ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -19,12 +18,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.5 2004/03/16 17:24:06 obrien Exp $"); + +#include #include #include -#if !defined(__FreeBSD__) -#include -#endif #include #include @@ -32,6 +31,7 @@ #include #include +#include #include #include #include @@ -77,7 +77,7 @@ double); static double sc_x2y(struct service_curve *, double); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ u_int32_t getifspeed(int, char *); #else u_int32_t getifspeed(char *); @@ -246,7 +246,7 @@ if (bw->bw_absolute > 0) pa->ifbandwidth = bw->bw_absolute; else -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ if ((rate = getifspeed(pf->dev, pa->ifname)) == 0) { #else if ((rate = getifspeed(pa->ifname)) == 0) { @@ -880,13 +880,8 @@ /* * admission control using generalized service curve */ -#if defined(__FreeBSD__) -#if defined(INFINITY) -#undef INFINITY -#endif +#ifndef INFINITY #define INFINITY HUGE_VAL /* positive infinity defined in */ -#else -#define INFINITY HUGE_VAL /* positive infinity defined in */ #endif /* add a new service curve to a generalized service curve */ @@ -1088,10 +1083,10 @@ return (buf); } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * XXX - * FreeBSD do not have SIOCGIFDATA. + * FreeBSD does not have SIOCGIFDATA. * To emulate this, DIOCGIFSPEED ioctl added to pf. */ u_int32_t ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_parser.c,v 1.175 2003/09/18 20:27:58 cedric Exp $ */ /* @@ -31,6 +30,9 @@ * */ +#include +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include #include #include @@ -46,19 +48,13 @@ #include #include #include +#include #include #include #include #include #include -#if defined(__FreeBSD__) -#include -#else -#define PRIu64 "llu" -#define PRId64 "lld" -#endif - #include "pfctl_parser.h" #include "pfctl.h" @@ -511,30 +507,32 @@ if (s->ifname[0] != 0) { printf("Interface Stats for %-16s %5s %16s\n", s->ifname, "IPv4", "IPv6"); - printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes In", - s->bcounters[0][0], s->bcounters[1][0]); - printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes Out", - s->bcounters[0][1], s->bcounters[1][1]); + printf(" %-25s %14llu %16llu\n", "Bytes In", + (unsigned long long)s->bcounters[0][0], + (unsigned long long)s->bcounters[1][0]); + printf(" %-25s %14llu %16llu\n", "Bytes Out", + (unsigned long long)s->bcounters[0][1], + (unsigned long long)s->bcounters[1][1]); printf(" Packets In\n"); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed", - s->pcounters[0][0][PF_PASS], - s->pcounters[1][0][PF_PASS]); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Blocked", - s->pcounters[0][0][PF_DROP], - s->pcounters[1][0][PF_DROP]); + printf(" %-23s %14llu %16llu\n", "Passed", + (unsigned long long)s->pcounters[0][0][PF_PASS], + (unsigned long long)s->pcounters[1][0][PF_PASS]); + printf(" %-23s %14llu %16llu\n", "Blocked", + (unsigned long long)s->pcounters[0][0][PF_DROP], + (unsigned long long)s->pcounters[1][0][PF_DROP]); printf(" Packets Out\n"); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed", - s->pcounters[0][1][PF_PASS], - s->pcounters[1][1][PF_PASS]); - printf(" %-23s %14"PRIu64" %16"PRIu64"\n\n", "Blocked", - s->pcounters[0][1][PF_DROP], - s->pcounters[1][1][PF_DROP]); + printf(" %-23s %14llu %16llu\n", "Passed", + (unsigned long long)s->pcounters[0][1][PF_PASS], + (unsigned long long)s->pcounters[1][1][PF_PASS]); + printf(" %-23s %14llu %16llu\n\n", "Blocked", + (unsigned long long)s->pcounters[0][1][PF_DROP], + (unsigned long long)s->pcounters[1][1][PF_DROP]); } printf("%-27s %14s %16s\n", "State Table", "Total", "Rate"); printf(" %-25s %14u %14s\n", "current entries", s->states, ""); for (i = 0; i < FCNT_MAX; i++) { - printf(" %-25s %14"PRIu64" ", pf_fcounters[i], - s->fcounters[i]); + printf(" %-25s %14llu ", pf_fcounters[i], + (unsigned long long)s->fcounters[i]); if (runtime > 0) printf("%14.1f/s\n", (double)s->fcounters[i] / (double)runtime); @@ -543,8 +541,8 @@ } printf("Counters\n"); for (i = 0; i < PFRES_MAX; i++) { - printf(" %-25s %14"PRIu64" ", pf_reasons[i], - s->counters[i]); + printf(" %-25s %14llu ", pf_reasons[i], + (unsigned long long)s->counters[i]); if (runtime > 0) printf("%14.1f/s\n", (double)s->counters[i] / (double)runtime); ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_parser.h,v 1.67 2003/08/21 19:12:09 frantzen Exp $ */ /* @@ -29,6 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.4 2004/03/16 17:24:06 obrien Exp $ */ #ifndef _PFCTL_PARSER_H_ @@ -135,7 +135,7 @@ } data; }; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * XXX * Absolutely this is not correct location to define this. ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ /* $OpenBSD: pfctl_qstats.c,v 1.24 2003/07/31 09:46:08 kjc Exp $ */ /* @@ -17,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.4 2004/03/16 17:24:06 obrien Exp $"); + #include #include #include @@ -37,12 +39,6 @@ #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 16 14:26:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 634B216A4D0; Tue, 16 Mar 2004 14:26:46 -0800 (PST) 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 39CBF16A4CE for ; Tue, 16 Mar 2004 14:26:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3252743D31 for ; Tue, 16 Mar 2004 14:26:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GMQjGe065661 for ; Tue, 16 Mar 2004 14:26:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GMQjxC065658 for perforce@freebsd.org; Tue, 16 Mar 2004 14:26:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 16 Mar 2004 14:26:45 -0800 (PST) Message-Id: <200403162226.i2GMQjxC065658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 22:26:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=49127 Change 49127 by peter@peter_daintree on 2004/03/16 14:25:44 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#32 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#23 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#32 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#33 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#6 (text+ko) ==== @@ -79,11 +79,6 @@ hint.fe.0.at="isa" hint.fe.0.disabled="1" hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" hint.lnc.0.at="isa" hint.lnc.0.disabled="1" hint.lnc.0.port="0x280" ==== //depot/projects/hammer/sys/amd64/conf/NOTES#23 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1136) +# (XXX from i386:NOTES,v 1.1148) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # @@ -232,10 +232,10 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) -# (requires miibus) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) From owner-p4-projects@FreeBSD.ORG Tue Mar 16 14:28:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1870F16A4D0; Tue, 16 Mar 2004 14:28:50 -0800 (PST) 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 DF0A916A4CE for ; Tue, 16 Mar 2004 14:28:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D86ED43D1D for ; Tue, 16 Mar 2004 14:28:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GMSnGe065847 for ; Tue, 16 Mar 2004 14:28:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GMSnIJ065844 for perforce@freebsd.org; Tue, 16 Mar 2004 14:28:49 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 16 Mar 2004 14:28:49 -0800 (PST) Message-Id: <200403162228.i2GMSnIJ065844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 22:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=49129 Change 49129 by peter@peter_daintree on 2004/03/16 14:28:27 massive cleanup of hints. Given that no machines have (nor ever will have!) isa slots.. we have some GC to do. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#7 (text+ko) ==== @@ -7,20 +7,6 @@ hint.fd.0.drive="0" hint.fd.1.at="fdc0" hint.fd.1.drive="1" -hint.ata.0.at="isa" -hint.ata.0.port="0x1F0" -hint.ata.0.irq="14" -hint.ata.1.at="isa" -hint.ata.1.port="0x170" -hint.ata.1.irq="15" -hint.adv.0.at="isa" -hint.adv.0.disabled="1" -hint.bt.0.at="isa" -hint.bt.0.disabled="1" -hint.aha.0.at="isa" -hint.aha.0.disabled="1" -hint.aic.0.at="isa" -hint.aic.0.disabled="1" hint.atkbdc.0.at="isa" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" @@ -31,8 +17,6 @@ hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" -hint.vt.0.at="isa" -hint.vt.0.disabled="1" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling hint.pcic.0.port="0x3e0" @@ -59,28 +43,3 @@ hint.sio.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" -hint.ed.0.at="isa" -hint.ed.0.disabled="1" -hint.ed.0.port="0x280" -hint.ed.0.irq="10" -hint.ed.0.maddr="0xd8000" -hint.cs.0.at="isa" -hint.cs.0.disabled="1" -hint.cs.0.port="0x300" -hint.sn.0.at="isa" -hint.sn.0.disabled="1" -hint.sn.0.port="0x300" -hint.sn.0.irq="10" -hint.ie.0.at="isa" -hint.ie.0.disabled="1" -hint.ie.0.port="0x300" -hint.ie.0.irq="10" -hint.ie.0.maddr="0xd0000" -hint.fe.0.at="isa" -hint.fe.0.disabled="1" -hint.fe.0.port="0x300" -hint.lnc.0.at="isa" -hint.lnc.0.disabled="1" -hint.lnc.0.port="0x280" -hint.lnc.0.irq="10" -hint.lnc.0.drq="0" From owner-p4-projects@FreeBSD.ORG Wed Mar 17 09:27:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4235116A4D0; Wed, 17 Mar 2004 09:27:30 -0800 (PST) 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 10FC316A4CE; Wed, 17 Mar 2004 09:27:30 -0800 (PST) Received: from TRANG.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id E93BB43D2D; Wed, 17 Mar 2004 09:27:29 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (localhost [127.0.0.1]) by TRANG.nuxi.com (8.12.11/8.12.10) with ESMTP id i2HHRTvS094465; Wed, 17 Mar 2004 09:27:29 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.11/8.12.11/Submit) id i2HHROhM094464; Wed, 17 Mar 2004 09:27:24 -0800 (PST) (envelope-from obrien) Date: Wed, 17 Mar 2004 09:27:24 -0800 From: "David O'Brien" To: Peter Wemm Message-ID: <20040317172724.GD93838@dragon.nuxi.com> References: <200403162228.i2GMSnIJ065844@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200403162228.i2GMSnIJ065844@repoman.freebsd.org> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 5.2-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Perforce Change Reviews Subject: Re: PERFORCE change 49129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2004 17:27:30 -0000 On Tue, Mar 16, 2004 at 02:28:49PM -0800, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=49129 > > Change 49129 by peter@peter_daintree on 2004/03/16 14:28:27 > > massive cleanup of hints. Given that no machines have (nor ever will have!) > isa slots.. we have some GC to do. yay! Mind if I just go ahead and commit to CVS, or do you plan to do that RSN? From owner-p4-projects@FreeBSD.ORG Wed Mar 17 17:13:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1906816A4D0; Wed, 17 Mar 2004 17:13:38 -0800 (PST) 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 E093C16A4CE for ; Wed, 17 Mar 2004 17:13:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3FD543D1F for ; Wed, 17 Mar 2004 17:13:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2I1DbGe082144 for ; Wed, 17 Mar 2004 17:13:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2I1DTi9082140 for perforce@freebsd.org; Wed, 17 Mar 2004 17:13:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Mar 2004 17:13:29 -0800 (PST) Message-Id: <200403180113.i2I1DTi9082140@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 Subject: PERFORCE change 49219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2004 01:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=49219 Change 49219 by rwatson@rwatson_paprika on 2004/03/17 17:13:20 sf_buf_free() reformulated. Giant substantially pushed down in wait() and various wait()-like ABIs; those ABI pieces now consume kern_exit(). bus_alloc_resource_any() API added. nmount() used from various ABI mount() variations. RaidFrame GC'd. arl wireless driver. pf ifdef and hook rearrangement. ata device removal tweaks, etc. GDB_AUTO_ENTER. security.jail.list_allowed removed. ps_argsopen bug fix. Additional vslock() related cleanup ptrace() proc locking fixed. sysv_sem() bug fixes. Giant pushed down in open(). More isa compat shim removal. Loop back if_tap softc locking. Loopback of if_tun's tun_proc to tun_pid conversion. Loopback staticizing netatalk bits. NFS "EPIPE" fix for TCP. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#7 integrate .. //depot/projects/netperf_socket/sys/conf/files#9 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#8 integrate .. //depot/projects/netperf_socket/sys/conf/options#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/joy/joy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/matcd/matcd_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcd_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcic/i82365.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcic/i82365_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_acctrace.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_alloclist.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_aselect.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_callback.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_chaindecluster.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_copyback.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_cvscan.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegrd.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegwr.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffrd.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffwr.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagfuncs.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagutils.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugMem.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugprint.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_decluster.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_declusterPQ.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.c#3 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_disks.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_driver.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_engine.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dagfuncs.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dags.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_fifo.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freebsdkintf.c#3 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_geniq.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_interdecluster.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_invertq.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_layout.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_map.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_mcpair.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_memchunk.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_nwayxor.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_options.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.c#3 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogDiskMgr.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogging.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityloggingdags.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityscan.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pq.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdeg.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdegdags.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_psstatus.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid0.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid1.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid4.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5_rotatedspare.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconbuffer.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconmap.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconstruct.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconutil.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_revent.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_shutdown.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_sstf.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_states.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_stripelocks.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_strutils.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_threadstuff.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_threadstuff.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_types.h#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_utils.c#2 delete .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/gusmidi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mpu.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csamidi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#12 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/mse.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spic.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#4 integrate .. //depot/projects/netperf_socket/sys/isa/isa_common.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/orm.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#4 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/modules/arl/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/raidframe/Makefile#2 delete .. //depot/projects/netperf_socket/sys/net/if_tap.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_tapvar.h#4 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#5 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/canbus.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98kbd.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/ppc.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/netperf_socket/sys/pccard/mecia.c#2 integrate .. //depot/projects/netperf_socket/sys/pccard/pcic_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/alpm.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/amdpm.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_mn.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/intpm.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/ncr.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/viapm.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/xrpu.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_ebus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_fhc.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/ata.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/sf_buf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#4 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/wait.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.100 2004/03/16 19:04:27 alc Exp $"); #include "opt_kstack_pages.h" @@ -437,27 +437,12 @@ } /* - * Detatch mapped page and release resources back to the system. + * Release resources back to the system. */ void -sf_buf_free(void *addr, void *args) +sf_buf_free(struct sf_buf *sf) { - struct sf_buf *sf; - struct vm_page *m; - sf = args; - m = sf->m; - vm_page_lock_queues(); - vm_page_unwire(m, 0); - /* - * Check for the object going away on us. This can - * happen since we don't hold a reference to it. - * If so, we're responsible for freeing the page. - */ - if (m->wire_count == 0 && m->object == NULL) - vm_page_free(m); - vm_page_unlock_queues(); - sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); nsfbufsused--; ==== //depot/projects/netperf_socket/sys/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); #include #include @@ -169,9 +169,7 @@ u_long start, u_long end, u_long count, u_int flags) { /* - * Consider adding a resource definition. We allow rid 0-1 for - * irq and drq, 0-3 for memory and 0-7 for ports which is - * sufficient for isapnp. + * Consider adding a resource definition. */ int passthrough = (device_get_parent(child) != bus); int isdefault = (start == 0UL && end == ~0UL); ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#3 (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.15 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.16 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#3 (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.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#3 (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.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #include "opt_compat.h" @@ -24,7 +24,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = */ { AS(linux_link_args), (sy_call_t *)linux_link }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink }, /* 10 = linux_unlink */ ==== //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -43,7 +43,7 @@ 4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } 5 UNIMPL 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL 9 STD { int linux_link(char *path, char *to); } ==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.45 2004/02/04 21:52:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.46 2004/03/17 19:59:59 jhb Exp $"); #include #include @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -1376,27 +1377,23 @@ struct thread *td; struct osf1_wait4_args *uap; { - int error; - caddr_t sg; - struct osf1_rusage *orusage, oru; - struct rusage *rusage = NULL, ru; + int error, status; + struct osf1_rusage oru; + struct rusage ru; - orusage = uap->rusage; - if (orusage) { - sg = stackgap_init(); - rusage = stackgap_alloc(&sg, sizeof(struct rusage)); - uap->rusage = (struct osf1_rusage *)rusage; - } - if ((error = wait4(td, (struct wait_args *)uap))) - return error; - if (orusage && (error = copyin(rusage, &ru, sizeof(ru)) == 0)){ + error = kern_wait(td, uap->pid, &status, uap->options, &ru); + if (error) + return (error); + if (uap->status != NULL) + error = copyout(&status, uap->status, sizeof(status)); + if (uap->rusage != NULL && error == 0) { TV_CP(ru.ru_utime, oru.ru_utime); TV_CP(ru.ru_stime, oru.ru_stime); bcopy(&ru.ru_first, &oru.ru_first, (&(oru.ru_last) - &(oru.ru_first))); - copyout(&oru, orusage, sizeof (struct osf1_rusage)); + error = copyout(&oru, uap->rusage, sizeof (struct osf1_rusage)); } - return (0); + return (error); } ==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.9 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.10 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #ifndef _OSF1_SYSPROTO_H_ ==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #define OSF1_SYS_nosys 0 ==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #include "opt_compat.h" @@ -25,7 +25,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = old open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link }, /* 9 = link */ { AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ ==== //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp $ +; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from OSF1). @@ -37,7 +37,7 @@ 4 MNOPROTO { ssize_t write(int fd, char *buf, ssize_t nbyte); } 5 UNIMPL old open 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL old creat 9 NOPROTO { int link(char *path, char *link); } ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.228 2004/01/28 23:58:55 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.229 2004/03/16 19:04:27 alc Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -490,27 +490,12 @@ } /* - * Detatch mapped page and release resources back to the system. + * Release resources back to the system. */ void -sf_buf_free(void *addr, void *args) +sf_buf_free(struct sf_buf *sf) { - struct sf_buf *sf; - struct vm_page *m; - sf = args; - m = sf->m; - vm_page_lock_queues(); - vm_page_unwire(m, 0); - /* - * Check for the object going away on us. This can - * happen since we don't hold a reference to it. - * If so, we're responsible for freeing the page. - */ - if (m->wire_count == 0 && m->object == NULL) - vm_page_free(m); - vm_page_unlock_queues(); - sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); nsfbufsused--; ==== //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.9 2004/01/28 23:46:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.10 2004/03/17 17:50:23 njl Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -392,7 +392,7 @@ /* Try to allocate our IRQ and then free it. */ rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0); + res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0); if (res != NULL) bus_release_resource(dev, SYS_RES_IRQ, rid, res); return (0); ==== //depot/projects/netperf_socket/sys/amd64/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.145 2003/11/21 03:02:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.146 2004/03/17 21:45:55 jmg Exp $"); /* * Modifications for Intel architecture by Garrett A. Wollman. @@ -86,9 +86,7 @@ u_long start, u_long end, u_long count, u_int flags) { /* - * Consider adding a resource definition. We allow rid 0-1 for - * irq and drq, 0-3 for memory and 0-7 for ports which is - * sufficient for isapnp. + * Consider adding a resource definition. */ int passthrough = (device_get_parent(child) != bus); int isdefault = (start == 0UL && end == ~0UL); ==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.19 2004/01/28 23:45:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.20 2004/03/17 19:59:59 jhb Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -88,21 +89,16 @@ int freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap) { - int error; - caddr_t sg; - struct rusage32 *rusage32, ru32; - struct rusage *rusage = NULL, ru; + int error, status; + struct rusage32 ru32; + struct rusage ru; - rusage32 = uap->rusage; - if (rusage32) { - sg = stackgap_init(); - rusage = stackgap_alloc(&sg, sizeof(struct rusage)); - uap->rusage = (struct rusage32 *)rusage; - } - error = wait4(td, (struct wait_args *)uap); + error = kern_wait(td, uap->pid, &status, uap->options, &ru); if (error) return (error); - if (rusage32 && (error = copyin(rusage, &ru, sizeof(ru)) == 0)) { + if (uap->status != NULL) + error = copyout(&status, uap->status, sizeof(status)); + if (uap->rusage != NULL && error == 0) { TV_CP(ru, ru32, ru_utime); TV_CP(ru, ru32, ru_stime); CP(ru, ru32, ru_maxrss); @@ -119,7 +115,7 @@ CP(ru, ru32, ru_nsignals); CP(ru, ru32, ru_nvcsw); CP(ru, ru32, ru_nivcsw); - error = copyout(&ru32, rusage32, sizeof(ru32)); + error = copyout(&ru32, uap->rusage, sizeof(ru32)); } return (error); } ==== //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.83 2003/11/19 04:12:31 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.85 2004/03/16 09:05:56 tjr Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -732,19 +732,20 @@ struct ufs_args ufs; char fstypename[MFSNAMELEN]; char mntonname[MNAMELEN], mntfromname[MNAMELEN]; + struct uio auio; + struct iovec iov[4]; int error; int fsflags; - const char *fstype; void *fsdata; error = copyinstr(args->filesystemtype, fstypename, MFSNAMELEN - 1, NULL); if (error) return (error); - error = copyinstr(args->specialfile, mntfromname, MFSNAMELEN - 1, NULL); + error = copyinstr(args->specialfile, mntfromname, MNAMELEN - 1, NULL); if (error) return (error); - error = copyinstr(args->dir, mntonname, MFSNAMELEN - 1, NULL); + error = copyinstr(args->dir, mntonname, MNAMELEN - 1, NULL); if (error) return (error); @@ -755,7 +756,7 @@ #endif if (strcmp(fstypename, "ext2") == 0) { - fstype = "ext2fs"; + strcpy(fstypename, "ext2fs"); fsdata = &ufs; ufs.fspec = mntfromname; #define DEFAULT_ROOTID -2 @@ -763,7 +764,7 @@ ufs.export.ex_flags = args->rwflag & LINUX_MS_RDONLY ? MNT_EXRDONLY : 0; } else if (strcmp(fstypename, "proc") == 0) { - fstype = "linprocfs"; + strcpy(fstypename, "linprocfs"); fsdata = NULL; } else { return (ENODEV); @@ -788,7 +789,23 @@ fsflags |= MNT_UPDATE; } - return (vfs_mount(td, fstype, mntonname, fsflags, fsdata)); + if (strcmp(fstypename, "linprocfs") == 0) { + bzero(&auio, sizeof(auio)); + auio.uio_iov = iov; + auio.uio_iovcnt = sizeof(iov) / sizeof(*iov); + auio.uio_segflg = UIO_SYSSPACE; + iov[0].iov_base = "fstype"; + iov[0].iov_len = sizeof("fstype"); + iov[1].iov_base = fstypename; + iov[1].iov_len = strlen(fstypename) + 1; + iov[2].iov_base = "fspath"; + iov[2].iov_len = sizeof("fspath"); + iov[3].iov_base = mntonname; + iov[3].iov_len = strlen(mntonname) + 1; + error = vfs_nmount(td, fsflags, &auio); + } else + error = vfs_mount(td, fstypename, mntonname, fsflags, fsdata); + return (error); } int ==== //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.152 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.153 2004/03/17 19:59:59 jhb Exp $"); #include "opt_mac.h" @@ -795,13 +795,7 @@ int linux_waitpid(struct thread *td, struct linux_waitpid_args *args) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 18 14:56:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5AA616A4D0; Thu, 18 Mar 2004 14:56:48 -0800 (PST) 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 763A616A4CE for ; Thu, 18 Mar 2004 14:56:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A0E543D1D for ; Thu, 18 Mar 2004 14:56:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2IMulGe033970 for ; Thu, 18 Mar 2004 14:56:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2IMubww033966 for perforce@freebsd.org; Thu, 18 Mar 2004 14:56:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 18 Mar 2004 14:56:37 -0800 (PST) Message-Id: <200403182256.i2IMubww033966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2004 22:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=49275 Change 49275 by peter@peter_daintree on 2004/03/18 14:56:24 IFC @49274 Affected files ... .. //depot/projects/hammer/Makefile.inc1#44 integrate .. //depot/projects/hammer/UPDATING#35 integrate .. //depot/projects/hammer/UPDATING.64BTT#4 integrate .. //depot/projects/hammer/bin/ps/ps.1#10 integrate .. //depot/projects/hammer/bin/ps/ps.c#7 integrate .. //depot/projects/hammer/bin/sh/Makefile#6 integrate .. //depot/projects/hammer/contrib/binutils/include/getopt.h#3 delete .. //depot/projects/hammer/contrib/binutils/libiberty/getopt.c#2 delete .. //depot/projects/hammer/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/hammer/crypto/openssl/CHANGES#4 integrate .. //depot/projects/hammer/crypto/openssl/Configure#4 integrate .. //depot/projects/hammer/crypto/openssl/FAQ#4 integrate .. //depot/projects/hammer/crypto/openssl/LICENSE#3 integrate .. //depot/projects/hammer/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/hammer/crypto/openssl/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/NEWS#4 integrate .. //depot/projects/hammer/crypto/openssl/README#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/apps.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/pkcs7.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/x509.c#4 integrate .. //depot/projects/hammer/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/hammer/crypto/openssl/config#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_time.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/b_print.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bio_cb.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bss_file.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/comp/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/cfb_enc.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/ecb_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md2/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/mem.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_doit.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/threads/mttest.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_txt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/openssl.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/s_client.pod#4 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/hammer/crypto/openssl/doc/apps/smime.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/hammer/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/hammer/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/EVP_DigestInit.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/hammer/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/hammer/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/des.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/hammer/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_pkt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_asn1.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssltest.c#4 integrate .. //depot/projects/hammer/crypto/openssl/test/Makefile.ssl#4 integrate .. //depot/projects/hammer/crypto/openssl/tools/Makefile.ssl#3 integrate .. //depot/projects/hammer/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/hammer/crypto/openssl/util/extract-names.pl#3 integrate .. //depot/projects/hammer/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/hammer/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/hammer/etc/rc.d/savecore#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/i386/bfd.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/patch.1#2 integrate .. //depot/projects/hammer/include/stdio.h#6 integrate .. //depot/projects/hammer/lib/libalias/alias.c#5 integrate .. //depot/projects/hammer/lib/libalias/alias.h#5 integrate .. //depot/projects/hammer/lib/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_db.c#6 integrate .. //depot/projects/hammer/lib/libalias/alias_ftp.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_irc.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_local.h#4 integrate .. //depot/projects/hammer/lib/libalias/alias_nbt.c#4 integrate .. //depot/projects/hammer/lib/libalias/alias_old.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_pptp.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_proxy.c#4 integrate .. //depot/projects/hammer/lib/libalias/alias_skinny.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_smedia.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_util.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/flt_rounds.c#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpgetround.c#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpgetsticky.c#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpsetround.c#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpsetsticky.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fileno.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/putc.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/putc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/putchar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/stdio.3#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#11 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#60 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#11 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_free.3#1 branch .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_load_file.3#1 branch .. //depot/projects/hammer/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_sign.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_size.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_config.3#1 branch .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#1 branch .. //depot/projects/hammer/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_add.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_egd.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_print.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_size.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bio.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/blowfish.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn_internal.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/buffer.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/crypto.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/des.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dh.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dsa.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/err.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/evp.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/hmac.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lh_stats.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lhash.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/md5.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/mdc2.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rand.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rc4.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ripemd.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rsa.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/sha.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/threads.3#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/hammer/share/man/man4/de.4#3 integrate .. //depot/projects/hammer/share/man/man4/firewire.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#2 integrate .. //depot/projects/hammer/share/man/man9/Makefile#31 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#6 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#9 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#58 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#8 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#35 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#12 integrate .. //depot/projects/hammer/sys/conf/NOTES#37 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#20 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#7 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/hammer/sys/dev/adlink/adlink.c#7 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#7 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/hammer/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/hammer/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#9 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#16 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#9 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#31 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#18 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#11 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#6 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#11 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#8 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#8 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#10 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/digi/digi_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.h#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#15 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#23 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#29 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#10 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#10 integrate .. //depot/projects/hammer/sys/dev/hfa/hfa_freebsd.c#4 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#10 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#5 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/hammer/sys/dev/joy/joy.c#5 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#14 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#6 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/matcd/matcd_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/md/md.c#26 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#7 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#10 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#7 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#13 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#6 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#17 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#23 integrate .. //depot/projects/hammer/sys/dev/pci/isa_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/pcic/i82365.c#6 integrate .. //depot/projects/hammer/sys/dev/pcic/i82365_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fea.c#5 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#5 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#6 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/hammer/sys/dev/pst/pst-pci.c#5 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#9 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#9 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#6 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#11 integrate .. //depot/projects/hammer/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#10 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#4 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/hammer/sys/dev/scd/scd_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/si/si_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#28 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#13 integrate .. //depot/projects/hammer/sys/dev/snc/if_snc.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/gusmidi.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mpu.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/uartsio.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#10 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_subr.c#3 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#13 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#10 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#14 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#31 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#31 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#25 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#10 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#14 integrate .. //depot/projects/hammer/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/hammer/sys/dev/zs/zs_sbus.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#26 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#6 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/ic/scd1400.h#2 delete .. //depot/projects/hammer/sys/i386/isa/if_el.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/isa.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/spic.c#7 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_isa.c#4 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_pci.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_drn_ngo.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_usr_sti.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_pci.c#5 integrate .. //depot/projects/hammer/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/hammer/sys/isa/atkbd_isa.c#4 integrate .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#5 integrate .. //depot/projects/hammer/sys/isa/fd.c#14 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#11 integrate .. //depot/projects/hammer/sys/isa/orm.c#4 integrate .. //depot/projects/hammer/sys/isa/psm.c#14 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#25 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#12 integrate .. //depot/projects/hammer/sys/modules/arl/Makefile#2 integrate .. //depot/projects/hammer/sys/net/if_tap.c#12 integrate .. //depot/projects/hammer/sys/net/if_tapvar.h#4 integrate .. //depot/projects/hammer/sys/net/if_tun.c#13 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#7 integrate .. //depot/projects/hammer/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/hammer/sys/pc98/pc98/canbus.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#14 integrate .. //depot/projects/hammer/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/olpt.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#17 integrate .. //depot/projects/hammer/sys/pccard/mecia.c#3 integrate .. //depot/projects/hammer/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/hammer/sys/pci/agp.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_amd.c#8 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#12 integrate .. //depot/projects/hammer/sys/pci/alpm.c#6 integrate .. //depot/projects/hammer/sys/pci/amdpm.c#6 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#31 integrate .. //depot/projects/hammer/sys/pci/if_de.c#13 integrate .. //depot/projects/hammer/sys/pci/if_mn.c#7 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#17 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#30 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#18 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#24 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#22 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#18 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#19 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#16 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#17 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#17 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#32 integrate .. //depot/projects/hammer/sys/pci/intpm.c#6 integrate .. //depot/projects/hammer/sys/pci/ncr.c#10 integrate .. //depot/projects/hammer/sys/pci/viapm.c#6 integrate .. //depot/projects/hammer/sys/pci/xrpu.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate .. //depot/projects/hammer/sys/sys/bus.h#9 integrate .. //depot/projects/hammer/sys/sys/wait.h#2 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#12 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#6 integrate .. //depot/projects/hammer/usr.bin/xinstall/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/xinstall/pathnames.h#2 delete .. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#8 integrate .. //depot/projects/hammer/usr.sbin/Makefile#46 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.8#2 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.c#2 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofw_util.c#4 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsock.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#44 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.418 2004/03/18 10:17:03 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -537,20 +537,36 @@ @echo "===> ${_kernel}" mkdir -p ${KRNLOBJDIR} .if !defined(NO_KERNELCONFIG) + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 1: configuring the kernel" + @echo "--------------------------------------------------------------" cd ${KRNLCONFDIR}; \ PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} .endif .if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 2.1: cleaning up the object tree" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR} .endif + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 2.2: rebuilding the object tree" + @echo "--------------------------------------------------------------" + cd ${KRNLOBJDIR}/${_kernel}; \ + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 2.3: build tools" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ ${MAKE} -DNO_CPU_CFLAGS -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all @@ -560,9 +576,17 @@ .endfor .endif .if !defined(NO_KERNELDEPEND) + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 3.1: making dependencies" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ .endif + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 3.2: building everything" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" ==== //depot/projects/hammer/UPDATING#35 (text+ko) ==== @@ -27,8 +27,8 @@ 20040308: The packet filter (pf) is now installed with the base system. Make sure to run mergemaster -p before installworld to create required - user accounts. If you do not want to build pf with your system you - can use the NO_PF knob in make.conf. + user account ("proxy"). If you do not want to build pf with your + system you can use the NO_PF knob in make.conf. Also note that pf requires "options PFIL_HOOKS" in the kernel. The pf system consists of the following three devices: device pf # required @@ -1548,4 +1548,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $ +$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $ ==== //depot/projects/hammer/UPDATING.64BTT#4 (text+ko) ==== @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -------+---------+---------+---------+---------+---------+---------+---------+ -# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $ +# $FreeBSD: src/UPDATING.64BTT,v 1.5 2004/03/17 01:59:47 gad Exp $ # -------+---------+---------+---------+---------+---------+---------+---------+ If you are in too much of a hurry to read this file, then this is not the @@ -97,6 +97,13 @@ that port and make sure you can get it working *before* you make the change to use 64-bit time_t's. +Step Pre-4: For people using database-related ports: + Ports like PostgreSQL may change how they store data after + they are recompiled for 64-bTT. So, you may have to do a + full dump of your data while you still have a 32-bTT system, + and do a matching initdb/restore of your data after the port + has been recompiled on the upgraded 64-bTT system. + After you have built and installed that src-snapshot with 32-bit time_t's, edit the file /usr/src/sys/sparc64/include/_types.h find the line: ==== //depot/projects/hammer/bin/ps/ps.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.66 2004/01/21 16:25:36 cperciva Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -45,7 +45,10 @@ .Op Fl N Ar system .Op Fl O Ar fmt .Op Fl o Ar fmt -.Op Fl p Ar pid +.Oo Fl p Ar pid Ns Xo +.Op , Ns Ar pid Ns No ... +.Xc +.Oc .Op Fl t Ar tty .Oo Fl U Ar username Ns Xo .Op , Ns Ar username Ns No ... @@ -146,7 +149,7 @@ the standard header. .It Fl p Display information associated with the specified process -.Tn ID . +.Tn ID(s) . .It Fl r Sort by current cpu usage, instead of by process .Tn ID . ==== //depot/projects/hammer/bin/ps/ps.c#7 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.64 2004/02/22 17:59:31 deischen Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.66 2004/03/18 01:28:23 gad Exp $"); #include #include @@ -54,6 +54,7 @@ #include #include +#include #include #include #include @@ -99,6 +100,7 @@ static void dynsizevars(KINFO *); static void sizevars(void); static void usage(void); +static pid_t *getpids(const char *, int *); static uid_t *getuids(const char *, int *); static char dfmt[] = "pid,tt,state,time,command"; @@ -125,10 +127,11 @@ struct varent *vent; struct winsize ws; dev_t ttydev; - pid_t pid; + pid_t *pids; uid_t *uids; - int all, ch, flag, i, _fmt, lineno, nentries, nocludge, dropgid; - int prtheader, wflag, what, xflg, uid, nuids, showthreads; + int all, ch, dropgid, flag, _fmt, i, lineno; + int nentries, nocludge, noutput, npids, nuids, pid; + int prtheader, showthreads, uid, wflag, what, xflg; char *cols; char errbuf[_POSIX2_LINE_MAX]; const char *cp, *nlistf, *memf; @@ -168,9 +171,8 @@ } all = _fmt = prtheader = wflag = xflg = 0; - pid = -1; - nuids = 0; - uids = NULL; + npids = nuids = 0; + pids = uids = NULL; ttydev = NODEV; dropgid = 0; memf = nlistf = _PATH_DEVNULL; @@ -239,7 +241,7 @@ break; #endif case 'p': - pid = atol(optarg); + pids = getpids(optarg, &npids); xflg = 1; break; case 'r': @@ -333,7 +335,7 @@ parsefmt(dfmt, 0); /* XXX - should be cleaner */ - if (!all && ttydev == NODEV && pid == -1 && !nuids) { + if (!all && ttydev == NODEV && !npids && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) errx(1, "malloc failed"); nuids = 1; @@ -354,9 +356,9 @@ } else if (ttydev != NODEV) { what = KERN_PROC_TTY | showthreads; flag = ttydev; - } else if (pid != -1) { + } else if (npids == 1) { what = KERN_PROC_PID | showthreads; - flag = pid; + flag = *pids; } else { what = showthreads != 0 ? KERN_PROC_ALL : KERN_PROC_PROC; flag = 0; @@ -365,15 +367,18 @@ /* * select procs */ - if ((kp = kvm_getprocs(kd, what, flag, &nentries)) == 0 || nentries < 0) + kp = kvm_getprocs(kd, what, flag, &nentries); + if ((kp == 0 && nentries != 0) || nentries < 0) errx(1, "%s", kvm_geterr(kd)); - if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) - errx(1, "malloc failed"); - for (i = nentries; --i >= 0; ++kp) { - kinfo[i].ki_p = kp; - if (needuser) - saveuser(&kinfo[i]); - dynsizevars(&kinfo[i]); + if (nentries > 0) { + if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) + errx(1, "malloc failed"); + for (i = nentries; --i >= 0; ++kp) { + kinfo[i].ki_p = kp; + if (needuser) + saveuser(&kinfo[i]); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 19 02:32:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88B7016A4D0; Fri, 19 Mar 2004 02:32:08 -0800 (PST) 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 4953A16A4CE for ; Fri, 19 Mar 2004 02:32:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CC3043D41 for ; Fri, 19 Mar 2004 02:32:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2JAW8Ge012010 for ; Fri, 19 Mar 2004 02:32:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2JAW7wF011995 for perforce@freebsd.org; Fri, 19 Mar 2004 02:32:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Mar 2004 02:32:07 -0800 (PST) Message-Id: <200403191032.i2JAW7wF011995@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 Subject: PERFORCE change 49292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2004 10:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=49292 Change 49292 by rwatson@rwatson_paprika on 2004/03/19 02:31:15 Integrate netperf_socket: ACPI import. Remove GDB_AUTO_ENTER. USB debugging tweaks. Loop back clone_cleanup() fix for if_tap. Loop back fix to EBUSY with if_tap. Appletalk breakout of ddp_usrreq.c pcb functions into ddp_pcb.c. Can no longer mmap files as executable from noexec file systems. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#8 integrate .. //depot/projects/netperf_socket/sys/conf/files#10 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/ic/scd1400.h#2 delete .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#6 integrate .. //depot/projects/netperf_socket/sys/modules/arl/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#6 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#1 branch .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.h#1 branch .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.236 2004/03/18 02:53:38 obrien Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1016,7 +1016,8 @@ return (error); } SYSCTL_PROC(_machdep, OID_AUTO, hlt_cpus, CTLTYPE_INT|CTLFLAG_RW, - 0, 0, sysctl_hlt_cpus, "IU", ""); + 0, 0, sysctl_hlt_cpus, "IU", + "Bitmap of CPUs to halt. 101 (binary) will halt CPUs 0 and 2."); static int sysctl_hlt_logical_cpus(SYSCTL_HANDLER_ARGS) ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.12 2003/05/01 01:05:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.14 2004/03/19 03:28:38 obrien Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -7,20 +7,6 @@ hint.fd.0.drive="0" hint.fd.1.at="fdc0" hint.fd.1.drive="1" -hint.ata.0.at="isa" -hint.ata.0.port="0x1F0" -hint.ata.0.irq="14" -hint.ata.1.at="isa" -hint.ata.1.port="0x170" -hint.ata.1.irq="15" -hint.adv.0.at="isa" -hint.adv.0.disabled="1" -hint.bt.0.at="isa" -hint.bt.0.disabled="1" -hint.aha.0.at="isa" -hint.aha.0.disabled="1" -hint.aic.0.at="isa" -hint.aic.0.disabled="1" hint.atkbdc.0.at="isa" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" @@ -31,8 +17,6 @@ hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" -hint.vt.0.at="isa" -hint.vt.0.disabled="1" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling hint.pcic.0.port="0x3e0" @@ -59,33 +43,3 @@ hint.sio.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" -hint.ed.0.at="isa" -hint.ed.0.disabled="1" -hint.ed.0.port="0x280" -hint.ed.0.irq="10" -hint.ed.0.maddr="0xd8000" -hint.cs.0.at="isa" -hint.cs.0.disabled="1" -hint.cs.0.port="0x300" -hint.sn.0.at="isa" -hint.sn.0.disabled="1" -hint.sn.0.port="0x300" -hint.sn.0.irq="10" -hint.ie.0.at="isa" -hint.ie.0.disabled="1" -hint.ie.0.port="0x300" -hint.ie.0.irq="10" -hint.ie.0.maddr="0xd0000" -hint.fe.0.at="isa" -hint.fe.0.disabled="1" -hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" -hint.lnc.0.at="isa" -hint.lnc.0.disabled="1" -hint.lnc.0.port="0x280" -hint.lnc.0.irq="10" -hint.lnc.0.drq="0" ==== //depot/projects/netperf_socket/sys/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1206 2004/03/16 12:23:38 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1207 2004/03/18 12:22:31 brueffer Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2088,7 +2088,7 @@ options BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP # -# Add tie-ins for a hardware watchdog. This only enable the hooks; +# Add tie-ins for a hardware watchdog. This only enables the hooks; # the user must still supply the actual driver. # options HW_WDOG ==== //depot/projects/netperf_socket/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.875 2004/03/16 12:23:38 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.876 2004/03/19 07:21:22 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1237,6 +1237,7 @@ netatalk/at_rmx.c optional netatalkdebug netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk +netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk netatm/atm_aal5.c optional atm_core netatm/atm_cm.c optional atm_core ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.44 2004/03/14 01:29:05 trhodes Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.45 2004/03/18 18:05:08 obrien Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -18,6 +18,8 @@ .if ${CC} == "icc" COPTFLAGS?=-O +.elif ${MACHINE_ARCH} == "amd64" +COPTFLAGS?=-O2 -fno-strict-aliasing -frename-registers -pipe .else COPTFLAGS?=-O -pipe . if ${COPTFLAGS:M-O[23s]} != "" ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#3 (text+ko) ==== @@ -1,4 +1,66 @@ ---------------------------------------- +11 March 2004. Summary of changes for version 20040311: + +1) ACPI CA Core Subsystem: + +Fixed a problem where errors occurring during the parse phase of +control method execution did not abort cleanly. For example, +objects created and installed in the namespace were not deleted. +This caused all subsequent invocations of the method to return +the AE_ALREADY_EXISTS exception. + +Implemented a mechanism to force a control method to "Serialized" +execution if the method attempts to create namespace objects. +(The root of the AE_ALREADY_EXISTS problem.) + +Implemented support for the predefined _OSI "internal" control +method. Initial supported strings are "Linux", "Windows 2000", +"Windows 2001", and "Windows 2001.1", and can be easily upgraded +for new strings as necessary. This feature will allow "other" +operating systems to execute the fully tested, "Windows" code +path through the ASL code + +Global Lock Support: Now allows multiple acquires and releases +with any internal thread. Removed concept of "owning thread" for +this special mutex. + +Fixed two functions that were inappropriately declaring large +objects on the CPU stack: PsParseLoop, NsEvaluateRelative. +Reduces the stack usage during method execution considerably. + +Fixed a problem in the ACPI 2.0 FACS descriptor (actbl2.h) where +the S4Bios_f field was incorrectly defined as UINT32 instead of +UINT32_BIT. + +Fixed a problem where AcpiEvGpeDetect would fault if there were +no GPEs defined on the machine. + +Implemented two runtime options: One to force all control method +execution to "Serialized" to mimic Windows behavior, another to +disable _OSI support if it causes problems on a given machine. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release: + Non-Debug Version: 74.8K Code, 10.1K Data, 84.9K Total + Debug Version: 158.7K Code, 65.1K Data, 223.8K Total + Current Release: + Non-Debug Version: 76.5K Code, 11.3K Data, 87.8K Total + Debug Version: 160.3K Code, 66.0K Data, 226.3K Total + +2) iASL Compiler/Disassembler: + +Fixed an array size problem for FreeBSD that would cause the +compiler to fault. + +---------------------------------------- 20 February 2004. Summary of changes for version 20040220: 1) ACPI CA Core Subsystem: ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 149 $ + * $Revision: 150 $ * *****************************************************************************/ @@ -137,7 +137,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040220 +#define ACPI_CA_VERSION 0x20040311 /* Maximum objects in the various object caches */ @@ -258,6 +258,10 @@ #define ACPI_SMBUS_BUFFER_SIZE 34 +/* Number of strings associated with the _OSI reserved method */ + +#define ACPI_NUM_OSI_STRINGS 4 + /****************************************************************************** * ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acglobal.h - Declarations for global variables - * $Revision: 147 $ + * $Revision: 148 $ * *****************************************************************************/ @@ -152,7 +152,15 @@ extern UINT32 AcpiGbl_NestingLevel; +/***************************************************************************** + * + * Runtime configuration + * + ****************************************************************************/ +ACPI_EXTERN UINT8 AcpiGbl_CreateOsiMethod; +ACPI_EXTERN UINT8 AcpiGbl_AllMethodsSerialized; + /***************************************************************************** * * ACPI Table globals @@ -242,6 +250,7 @@ extern const char *AcpiGbl_HighestDstateNames[4]; extern const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES]; extern const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS]; +extern const char *AcpiGbl_ValidOsiStrings[ACPI_NUM_OSI_STRINGS]; /***************************************************************************** @@ -252,7 +261,7 @@ #define NUM_NS_TYPES ACPI_TYPE_INVALID+1 -#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) +#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) #define NUM_PREDEFINED_NAMES 10 #else #define NUM_PREDEFINED_NAMES 9 ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 148 $ + * $Revision: 149 $ * *****************************************************************************/ @@ -754,7 +754,4 @@ #endif /* ACPI_DBG_TRACK_ALLOCATIONS */ - -#define ACPI_GET_STACK_POINTER _asm {mov eax, ebx} - #endif /* ACMACROS_H */ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ /****************************************************************************** * * Name: acobject.h - Definition of ACPI_OPERAND_OBJECT (Internal object only) - * $Revision: 123 $ + * $Revision: 124 $ * *****************************************************************************/ @@ -259,7 +259,11 @@ } ACPI_OBJECT_EVENT; -#define INFINITE_CONCURRENCY 0xFF +#define ACPI_INFINITE_CONCURRENCY 0xFF + +typedef +ACPI_STATUS (*ACPI_INTERNAL_METHOD) ( + struct acpi_walk_state *WalkState); typedef struct acpi_object_method { @@ -269,6 +273,7 @@ UINT32 AmlLength; void *Semaphore; UINT8 *AmlStart; + ACPI_INTERNAL_METHOD Implementation; UINT8 Concurrency; UINT8 ThreadCount; ACPI_OWNER_ID OwningId; ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actbl2.h - ACPI Specification Revision 2.0 Tables - * $Revision: 35 $ + * $Revision: 36 $ * *****************************************************************************/ @@ -171,7 +171,7 @@ UINT32 HardwareSignature; /* Hardware configuration signature */ UINT32 FirmwareWakingVector; /* 32bit physical address of the Firmware Waking Vector. */ UINT32 GlobalLock; /* Global Lock used to synchronize access to shared hardware resources */ - UINT32 S4Bios_f : 1; /* S4Bios_f - Indicates if S4BIOS support is present */ + UINT32_BIT S4Bios_f : 1; /* S4Bios_f - Indicates if S4BIOS support is present */ UINT32_BIT Reserved1 : 31; /* Must be 0 */ UINT64 XFirmwareWakingVector; /* 64bit physical address of the Firmware Waking Vector. */ UINT8 Version; /* Version of this table */ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actypes.h - Common data types for the entire ACPI subsystem - * $Revision: 264 $ + * $Revision: 265 $ * *****************************************************************************/ @@ -428,7 +428,6 @@ /* * Power state values */ - #define ACPI_STATE_UNKNOWN (UINT8) 0xFF #define ACPI_STATE_S0 (UINT8) 0 @@ -472,7 +471,6 @@ #define ACPI_NOTIFY_BUS_MODE_MISMATCH (UINT8) 6 #define ACPI_NOTIFY_POWER_FAULT (UINT8) 7 - /* * Table types. These values are passed to the table related APIs */ @@ -488,7 +486,6 @@ #define ACPI_TABLE_MAX 6 #define NUM_ACPI_TABLE_TYPES (ACPI_TABLE_MAX+1) - /* * Types associated with ACPI names and objects. The first group of * values (up to ACPI_TYPE_EXTERNAL_MAX) correspond to the definition @@ -878,7 +875,7 @@ #define ACPI_INIT_DEVICE_INI 1 -/* Address Spaces (Operation Regions */ +/* Address Spaces (For Operation Regions) */ typedef ACPI_STATUS (*ACPI_ADR_SPACE_HANDLER) ( ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures - * $Revision: 159 $ + * $Revision: 160 $ * *****************************************************************************/ @@ -125,7 +125,6 @@ ACPI_GENERIC_STATE *State, void *Context); - ACPI_STATUS AcpiUtWalkPackageTree ( ACPI_OPERAND_OBJECT *SourceObject, @@ -133,7 +132,6 @@ ACPI_PKG_CALLBACK WalkCallback, void *Context); - typedef struct acpi_pkg_info { UINT8 *FreeSpace; @@ -550,6 +548,10 @@ ACPI_STATUS +AcpiUtOsiImplementation ( + ACPI_WALK_STATE *WalkState); + +ACPI_STATUS AcpiUtEvaluateObject ( ACPI_NAMESPACE_NODE *PrefixNode, char *Path, ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Name: amlcode.h - Definitions for AML, as included in "definition blocks" * Declarations and definitions contained herein are derived * directly from the ACPI specification. - * $Revision: 74 $ + * $Revision: 75 $ * *****************************************************************************/ @@ -569,11 +569,17 @@ } AML_ACCESS_ATTRIBUTE; -/* bit fields in MethodFlags byte */ +/* Bit fields in MethodFlags byte */ + +#define AML_METHOD_ARG_COUNT 0x07 +#define AML_METHOD_SERIALIZED 0x08 +#define AML_METHOD_SYNCH_LEVEL 0xF0 + +/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */ -#define METHOD_FLAGS_ARG_COUNT 0x07 -#define METHOD_FLAGS_SERIALIZED 0x08 -#define METHOD_FLAGS_SYNCH_LEVEL 0xF0 +#define AML_METHOD_INTERNAL_ONLY 0x01 +#define AML_METHOD_RESERVED1 0x02 +#define AML_METHOD_RESERVED2 0x04 #endif /* __AMLCODE_H__ */ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslutils.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: aslutils -- compiler utilities - * $Revision: 57 $ + * $Revision: 58 $ * *****************************************************************************/ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbexec.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbexec - debugger control method execution - * $Revision: 57 $ + * $Revision: 59 $ * ******************************************************************************/ @@ -474,12 +474,14 @@ #endif Status = AcpiDbExecuteMethod (Info, &ReturnObj); - if (ACPI_FAILURE (Status)) { AcpiOsPrintf ("%s During execution of %s at iteration %X\n", AcpiFormatException (Status), Info->Pathname, i); - break; + if (Status == AE_ABORT_METHOD) + { + break; + } } if ((i % 1000) == 0) ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dsmethod - Parser/Interpreter interface - control method parsing - * $Revision: 93 $ + * $Revision: 94 $ * *****************************************************************************/ @@ -182,7 +182,7 @@ /* Create a mutex for the method if there is a concurrency limit */ - if ((ObjDesc->Method.Concurrency != INFINITE_CONCURRENCY) && + if ((ObjDesc->Method.Concurrency != ACPI_INFINITE_CONCURRENCY) && (!ObjDesc->Method.Semaphore)) { Status = AcpiOsCreateSemaphore (ObjDesc->Method.Concurrency, @@ -389,37 +389,41 @@ return_ACPI_STATUS (Status); } - /* 1) Parse: Create a new walk state for the preempting walk */ + if (!(ObjDesc->Method.MethodFlags & AML_METHOD_INTERNAL_ONLY)) + { + /* 1) Parse: Create a new walk state for the preempting walk */ + + NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId, + Op, ObjDesc, NULL); + if (!NextWalkState) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } - NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId, - Op, ObjDesc, NULL); - if (!NextWalkState) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - /* Create and init a Root Node */ + /* Create and init a Root Node */ - Op = AcpiPsCreateScopeOp (); - if (!Op) - { - Status = AE_NO_MEMORY; - goto Cleanup; - } + Op = AcpiPsCreateScopeOp (); + if (!Op) + { + Status = AE_NO_MEMORY; + goto Cleanup; + } - Status = AcpiDsInitAmlWalk (NextWalkState, Op, MethodNode, - ObjDesc->Method.AmlStart, ObjDesc->Method.AmlLength, - NULL, NULL, 1); - if (ACPI_FAILURE (Status)) - { - AcpiDsDeleteWalkState (NextWalkState); - goto Cleanup; - } + Status = AcpiDsInitAmlWalk (NextWalkState, Op, MethodNode, + ObjDesc->Method.AmlStart, ObjDesc->Method.AmlLength, + NULL, NULL, 1); + if (ACPI_FAILURE (Status)) + { + AcpiDsDeleteWalkState (NextWalkState); + goto Cleanup; + } - /* Begin AML parse */ + /* Begin AML parse */ - Status = AcpiPsParseAml (NextWalkState); - AcpiPsDeleteParseTree (Op); + Status = AcpiPsParseAml (NextWalkState); + AcpiPsDeleteParseTree (Op); + } /* 2) Execute: Create a new state for the preempting walk */ @@ -430,7 +434,6 @@ Status = AE_NO_MEMORY; goto Cleanup; } - /* * The resolved arguments were put on the previous walk state's operand * stack. Operands on the previous walk state stack always @@ -464,16 +467,27 @@ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Starting nested execution, newstate=%p\n", NextWalkState)); + if (ObjDesc->Method.MethodFlags & AML_METHOD_INTERNAL_ONLY) + { + Status = ObjDesc->Method.Implementation (NextWalkState); + return_ACPI_STATUS (Status); + } + return_ACPI_STATUS (AE_OK); /* On error, we must delete the new walk state */ Cleanup: + if (NextWalkState->MethodDesc) + { + /* Decrement the thread count on the method parse tree */ + + NextWalkState->MethodDesc->Method.ThreadCount--; + } (void) AcpiDsTerminateControlMethod (NextWalkState); AcpiDsDeleteWalkState (NextWalkState); return_ACPI_STATUS (Status); - } @@ -604,12 +618,34 @@ } } - /* Decrement the thread count on the method parse tree */ + if (WalkState->MethodDesc->Method.ThreadCount) + { + ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, + "*** Not deleting method namespace, there are still %d threads\n", + WalkState->MethodDesc->Method.ThreadCount)); + } - WalkState->MethodDesc->Method.ThreadCount--; if (!WalkState->MethodDesc->Method.ThreadCount) { /* + * Support to dynamically change a method from NotSerialized to + * Serialized if it appears that the method is written foolishly and + * does not support multiple thread execution. The best example of this + * is if such a method creates namespace objects and blocks. A second + * thread will fail with an AE_ALREADY_EXISTS exception + * + * This code is here because we must wait until the last thread exits + * before creating the synchronization semaphore. + */ + if ((WalkState->MethodDesc->Method.Concurrency == 1) && + (!WalkState->MethodDesc->Method.Semaphore)) + { + Status = AcpiOsCreateSemaphore (1, + 1, + &WalkState->MethodDesc->Method.Semaphore); + } + + /* * There are no more threads executing this method. Perform * additional cleanup. * ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evgpe - General Purpose Event handling and dispatch - * $Revision: 33 $ + * $Revision: 34 $ * *****************************************************************************/ @@ -228,6 +228,12 @@ ACPI_FUNCTION_NAME ("EvGpeDetect"); + /* Check for the case where there are no GPEs */ + + if (!GpeXruptList) + { + return (IntStatus); + } /* Examine all GPE blocks attached to this interrupt level */ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/excreate.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: excreate - Named object creation - * $Revision: 101 $ + * $Revision: 102 $ * *****************************************************************************/ @@ -681,29 +681,36 @@ ObjDesc->Method.AmlStart = AmlStart; ObjDesc->Method.AmlLength = AmlLength; - /* disassemble the method flags */ - + /* + * Disassemble the method flags. Split off the Arg Count + * for efficiency + */ MethodFlags = (UINT8) Operand[1]->Integer.Value; - ObjDesc->Method.MethodFlags = MethodFlags; - ObjDesc->Method.ParamCount = (UINT8) (MethodFlags & METHOD_FLAGS_ARG_COUNT); + ObjDesc->Method.MethodFlags = (UINT8) (MethodFlags & ~AML_METHOD_ARG_COUNT); + ObjDesc->Method.ParamCount = (UINT8) (MethodFlags & AML_METHOD_ARG_COUNT); /* * Get the concurrency count. If required, a semaphore will be * created for this method when it is parsed. */ - if (MethodFlags & METHOD_FLAGS_SERIALIZED) + if (AcpiGbl_AllMethodsSerialized) + { + ObjDesc->Method.Concurrency = 1; + ObjDesc->Method.MethodFlags |= AML_METHOD_SERIALIZED; + } + else if (MethodFlags & AML_METHOD_SERIALIZED) { /* * ACPI 1.0: Concurrency = 1 * ACPI 2.0: Concurrency = (SyncLevel (in method declaration) + 1) */ ObjDesc->Method.Concurrency = (UINT8) - (((MethodFlags & METHOD_FLAGS_SYNCH_LEVEL) >> 4) + 1); + (((MethodFlags & AML_METHOD_SYNCH_LEVEL) >> 4) + 1); } else { - ObjDesc->Method.Concurrency = INFINITE_CONCURRENCY; + ObjDesc->Method.Concurrency = ACPI_INFINITE_CONCURRENCY; } /* Attach the new object to the method Node */ ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmutex.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exmutex - ASL Mutex Acquire/Release functions - * $Revision: 20 $ + * $Revision: 21 $ * *****************************************************************************/ @@ -258,16 +258,20 @@ /* * Support for multiple acquires by the owning thread */ + if (ObjDesc->Mutex.OwnerThread) + { + /* Special case for Global Lock, allow all threads */ - if ((ObjDesc->Mutex.OwnerThread) && - (ObjDesc->Mutex.OwnerThread->ThreadId == WalkState->Thread->ThreadId)) - { - /* - * The mutex is already owned by this thread, - * just increment the acquisition depth - */ - ObjDesc->Mutex.AcquisitionDepth++; - return_ACPI_STATUS (AE_OK); + if ((ObjDesc->Mutex.OwnerThread->ThreadId == WalkState->Thread->ThreadId) || + (ObjDesc->Mutex.Semaphore == AcpiGbl_GlobalLockSemaphore)) + { + /* + * The mutex is already owned by this thread, + * just increment the acquisition depth + */ + ObjDesc->Mutex.AcquisitionDepth++; + return_ACPI_STATUS (AE_OK); + } } /* Acquire the mutex, wait if necessary */ @@ -341,9 +345,13 @@ return_ACPI_STATUS (AE_AML_INTERNAL); } - /* The Mutex is owned, but this thread must be the owner */ + /* + * The Mutex is owned, but this thread must be the owner. + * Special case for Global Lock, any thread can release + */ + if ((ObjDesc->Mutex.OwnerThread->ThreadId != WalkState->Thread->ThreadId) && + (ObjDesc->Mutex.Semaphore != AcpiGbl_GlobalLockSemaphore)) - if (ObjDesc->Mutex.OwnerThread->ThreadId != WalkState->Thread->ThreadId) { ACPI_REPORT_ERROR (( "Thread %X cannot release Mutex [%4.4s] acquired by thread %X\n", ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: nsaccess - Top-level functions for accessing ACPI namespace - * $Revision: 177 $ + * $Revision: 179 $ * ******************************************************************************/ @@ -182,8 +182,16 @@ for (InitVal = AcpiGbl_PreDefinedNames; InitVal->Name; InitVal++) { + /* _OSI is optional for now, will be permanent later */ + + if (!ACPI_STRCMP (InitVal->Name, "_OSI") && !AcpiGbl_CreateOsiMethod) + { + continue; + } + Status = AcpiNsLookup (NULL, InitVal->Name, InitVal->Type, - ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, NULL, &NewNode); + ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, + NULL, &NewNode); if (ACPI_FAILURE (Status) || (!NewNode)) /* Must be on same line for code converter */ { @@ -202,7 +210,8 @@ Status = AcpiOsPredefinedOverride (InitVal, &Val); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not override predefined %s\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "Could not override predefined %s\n", InitVal->Name)); } @@ -230,15 +239,20 @@ switch (InitVal->Type) { case ACPI_TYPE_METHOD: - ObjDesc->Method.ParamCount = - (UINT8) ACPI_STRTOUL (Val, NULL, 10); + ObjDesc->Method.ParamCount = (UINT8) ACPI_STRTOUL + (Val, NULL, 10); ObjDesc->Common.Flags |= AOPOBJ_DATA_VALID; -#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) +#if defined (_ACPI_ASL_COMPILER) || defined (_ACPI_DUMP_APP) - /* Compiler cheats by putting parameter count in the OwnerID */ + /* iASL Compiler cheats by putting parameter count in the OwnerID */ NewNode->OwnerId = ObjDesc->Method.ParamCount; +#else + /* Mark this as a very SPECIAL method */ + + ObjDesc->Method.MethodFlags = AML_METHOD_INTERNAL_ONLY; + ObjDesc->Method.Implementation = AcpiUtOsiImplementation; #endif break; @@ -263,8 +277,8 @@ case ACPI_TYPE_MUTEX: ObjDesc->Mutex.Node = NewNode; - ObjDesc->Mutex.SyncLevel = - (UINT16) ACPI_STRTOUL (Val, NULL, 10); + ObjDesc->Mutex.SyncLevel = (UINT16) ACPI_STRTOUL + (Val, NULL, 10); if (ACPI_STRCMP (InitVal->Name, "_GL_") == 0) { @@ -300,6 +314,7 @@ default: + ACPI_REPORT_ERROR (("Unsupported initial type value %X\n", InitVal->Type)); AcpiUtRemoveReference (ObjDesc); ==== //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: nsalloc - Namespace allocation and deletion utilities - * $Revision: 84 $ + * $Revision: 85 $ * ******************************************************************************/ @@ -428,10 +428,11 @@ Node->OwnerId = OwnerId; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 19 15:40:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56BA016A4D0; Fri, 19 Mar 2004 15:40:04 -0800 (PST) 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 319A816A4CE for ; Fri, 19 Mar 2004 15:40:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01DCB43D2D for ; Fri, 19 Mar 2004 15:40:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2JNe3Ge010487 for ; Fri, 19 Mar 2004 15:40:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2JNe3d9010484 for perforce@freebsd.org; Fri, 19 Mar 2004 15:40:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 15:40:03 -0800 (PST) Message-Id: <200403192340.i2JNe3d9010484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2004 23:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=49312 Change 49312 by peter@peter_overcee on 2004/03/19 15:39:43 sync with rest of p4 tree Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#6 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#6 (text+ko) ==== @@ -20,7 +20,7 @@ "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" X86_EMULATION= elf_i386_fbsd -_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\" +_i386_path= \"${TOOLS_PREFIX}/lib32\":\"${TOOLS_PREFIX}/usr/lib32\" EMS+= ${X86_EMULATION} LDSCRIPTS+= ${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \ ${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:09:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30F1716A4D0; Fri, 19 Mar 2004 16:09:43 -0800 (PST) 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 0B7E816A4CE for ; Fri, 19 Mar 2004 16:09:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0037443D2D for ; Fri, 19 Mar 2004 16:09:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K09gGe017811 for ; Fri, 19 Mar 2004 16:09:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K09fYs017808 for perforce@freebsd.org; Fri, 19 Mar 2004 16:09:41 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:09:41 -0800 (PST) Message-Id: <200403200009.i2K09fYs017808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=49316 Change 49316 by peter@peter_overcee on 2004/03/19 16:08:49 back out to vendor in preperation for doing it a different way Affected files ... .. //depot/projects/hammer/Makefile.inc1#45 edit .. //depot/projects/hammer/lib/Makefile#33 edit .. //depot/projects/hammer/lib/libc/Makefile#14 edit .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/db/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/man/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#6 edit .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#12 edit .. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#17 edit .. //depot/projects/hammer/lib/libc/net/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/regex/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/regex/grot/Makefile#3 edit .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/string/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc32/Makefile#2 delete .. //depot/projects/hammer/libexec/Makefile#22 edit .. //depot/projects/hammer/libexec/rtld-elf/Makefile#9 edit .. //depot/projects/hammer/libexec/rtld-elf32/Makefile#4 delete .. //depot/projects/hammer/share/mk/bsd.lib.mk#17 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#45 (text+ko) ==== @@ -256,8 +256,8 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - lib lib32 usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/lib32 usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs + lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ ==== //depot/projects/hammer/lib/Makefile#33 (text+ko) ==== @@ -32,7 +32,7 @@ ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ - ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_libc32} + ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -49,11 +49,6 @@ .endif .endif -# build libc_pic.a for rtld-elf-32 on amd64 -.if ${MACHINE_ARCH} == "amd64" -_libc32= libc32 -.endif - .if !defined(NOATM) _libatm= libatm _libngatm= libngatm ==== //depot/projects/hammer/lib/libc/Makefile#14 (text+ko) ==== @@ -10,15 +10,11 @@ LIB=c # If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. # If you bump SHLIB_MAJOR, see standards/55112. -.if !defined(${NOSHLIB}) SHLIB_MAJOR= 5 SHLIBDIR?= /lib -.endif WARNS?= 2 -TARGET?=${MACHINE_ARCH} -LIBCSRC?=${.CURDIR} -CFLAGS+=-I${LIBCSRC}/include -I${LIBCSRC}/../../include -CFLAGS+=-I${LIBCSRC}/${TARGET} +CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include +CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes @@ -34,36 +30,36 @@ # # If there is a machine dependent makefile, use it: # -.if exists(${LIBCSRC}/${TARGET}/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" .endif -.include "${LIBCSRC}/db/Makefile.inc" -.include "${LIBCSRC}/compat-43/Makefile.inc" -.include "${LIBCSRC}/gdtoa/Makefile.inc" -.include "${LIBCSRC}/gen/Makefile.inc" -.if ${TARGET} != "powerpc" -.include "${LIBCSRC}/gmon/Makefile.inc" +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gdtoa/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" .endif -.include "${LIBCSRC}/locale/Makefile.inc" -.include "${LIBCSRC}/net/Makefile.inc" -.include "${LIBCSRC}/nls/Makefile.inc" -.include "${LIBCSRC}/posix1e/Makefile.inc" +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" .if !defined(NO_QUAD) -.include "${LIBCSRC}/quad/Makefile.inc" +.include "${.CURDIR}/quad/Makefile.inc" .endif -.include "${LIBCSRC}/regex/Makefile.inc" -.include "${LIBCSRC}/stdio/Makefile.inc" -.include "${LIBCSRC}/stdlib/Makefile.inc" -.include "${LIBCSRC}/stdtime/Makefile.inc" -.include "${LIBCSRC}/string/Makefile.inc" -.include "${LIBCSRC}/sys/Makefile.inc" -.include "${LIBCSRC}/rpc/Makefile.inc" -.include "${LIBCSRC}/uuid/Makefile.inc" -.include "${LIBCSRC}/xdr/Makefile.inc" +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" .if !defined(NO_YP_LIBC) CFLAGS+= -DYP -.include "${LIBCSRC}/yp/Makefile.inc" +.include "${.CURDIR}/yp/Makefile.inc" .endif .if !defined(NO_HESIOD_LIBC) CFLAGS+= -DHESIOD @@ -90,14 +86,14 @@ KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \ strcat.c strcmp.c strcpy.c strlen.c strncpy.c -libkern: libkern.gen libkern.${TARGET} +libkern: libkern.gen libkern.${MACHINE_ARCH} libkern.gen: ${KQSRCS} ${KSRCS} - cp -p ${LIBCSRC}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern + cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern -libkern.${TARGET}:: ${KMSRCS} +libkern.${MACHINE_ARCH}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${TARGET} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH} .endif .include ==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#5 (text+ko) ==== @@ -14,34 +14,34 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${LIBCSRC}/${TARGET}/compat-43 ${LIBCSRC}/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c ==== //depot/projects/hammer/lib/libc/db/Makefile.inc#4 (text+ko) ==== @@ -3,9 +3,9 @@ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${LIBCSRC}/db/btree/Makefile.inc" -.include "${LIBCSRC}/db/db/Makefile.inc" -.include "${LIBCSRC}/db/hash/Makefile.inc" -.include "${LIBCSRC}/db/man/Makefile.inc" -.include "${LIBCSRC}/db/mpool/Makefile.inc" -.include "${LIBCSRC}/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" ==== //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 # $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/hammer/lib/libc/db/db/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c ==== //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/hammer/lib/libc/db/man/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/man +.PATH: ${.CURDIR}/db/man MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 ==== //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c ==== //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#6 (text+ko) ==== @@ -1,21 +1,21 @@ # $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.6 2004/01/18 10:32:49 das Exp $ # netlib gdtoa sources -.PATH: ${LIBCSRC}/gdtoa +.PATH: ${.CURDIR}/gdtoa MISRCS+=_hdtoa.c _ldtoa.c glue.c GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c -.if exists(${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk) -.include "${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk" .endif -CFLAGS+=-I${LIBCSRC}/../../contrib/gdtoa +CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa .for src in ${GDTOASRCS} MISRCS+=gdtoa_${src} CLEANFILES+=gdtoa_${src} gdtoa_${src}: - ln -sf ${LIBCSRC}/../../contrib/gdtoa/${src} ${.TARGET} + ln -sf ${.CURDIR}/../../contrib/gdtoa/${src} ${.TARGET} .endfor ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#12 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.109 2004/01/15 17:27:28 ru Exp $ # machine-independent gen sources -.PATH: ${LIBCSRC}/${TARGET}/gen ${LIBCSRC}/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -33,8 +33,8 @@ valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c # machine-dependent gen sources -.if exists(${LIBCSRC}/${TARGET}/gen/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif MAN+= alarm.3 arc4random.3 \ ==== //depot/projects/hammer/lib/libc/gmon/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${LIBCSRC}/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#17 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.53 2003/12/07 06:33:52 tjr Exp $ # locale sources -.PATH: ${LIBCSRC}/${TARGET}/locale ${LIBCSRC}/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ ==== //depot/projects/hammer/lib/libc/net/Makefile.inc#8 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.50 2003/11/14 18:53:22 bms Exp $ # machine-independent net sources -.PATH: ${LIBCSRC}/${TARGET}/net ${LIBCSRC}/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -35,8 +35,8 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${LIBCSRC}/${TARGET}/net/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ ==== //depot/projects/hammer/lib/libc/nls/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ # $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c ==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#8 (text+ko) ==== @@ -2,7 +2,7 @@ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${LIBCSRC}/posix1e +.PATH: ${.CURDIR}/posix1e SRCS+= acl_calc_mask.c \ acl_copy.c \ ==== //depot/projects/hammer/lib/libc/quad/Makefile.inc#4 (text+ko) ==== @@ -2,9 +2,9 @@ # $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $ # Quad support, if needed -.PATH: ${LIBCSRC}/${TARGET}/quad ${LIBCSRC}/quad +.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad -.if ${TARGET} == "i386" +.if ${MACHINE_ARCH} == "i386" SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c ==== //depot/projects/hammer/lib/libc/regex/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $ # regex sources -.PATH: ${LIBCSRC}/regex +.PATH: ${.CURDIR}/regex CFLAGS+=-DPOSIX_MISTAKE ==== //depot/projects/hammer/lib/libc/regex/grot/Makefile#3 (text+ko) ==== @@ -5,7 +5,7 @@ # Do not take -DPOSIX_MISTAKE out. REGCFLAGS isn't important to you (it's # for my use in some special contexts). -PATHS= ${LIBCSRC}/.. ${LIBCSRC}/../../locale ${LIBCSRC}/../../../../include +PATHS= ${.CURDIR}/.. ${.CURDIR}/../../locale ${.CURDIR}/../../../../include .PATH: ${PATHS} CFLAGS+= -DPOSIX_MISTAKE -DREDEBUG $(REGCFLAGS) ==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.26 2004/01/11 17:14:54 ru Exp $ -.PATH: ${LIBCSRC}/rpc ${LIBCSRC}/. +.PATH: ${.CURDIR}/rpc ${.CURDIR}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ @@ -26,7 +26,7 @@ SRCS+= crypt_clnt.c crypt_xdr.c crypt.h CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -CFLAGS+= -I${LIBCSRC}/rpc +CFLAGS+= -I${.CURDIR}/rpc CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h ==== //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $ -.PATH: ${LIBCSRC}/sparc64/fpu +.PATH: ${.CURDIR}/sparc64/fpu -CFLAGS+= -I${LIBCSRC}/sparc64/sys +CFLAGS+= -I${.CURDIR}/sparc64/sys SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \ fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c ==== //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#5 (text+ko) ==== @@ -10,7 +10,7 @@ __sparc_utrap_setup.c \ sigcode.S -CFLAGS+= -I${LIBCSRC}/sparc64/fpu +CFLAGS+= -I${.CURDIR}/sparc64/fpu MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#11 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ # stdio sources -.PATH: ${LIBCSRC}/stdio +.PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ ==== //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#11 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.47 2004/02/24 08:07:26 ache Exp $ # machine-independent stdlib sources -.PATH: ${LIBCSRC}/${TARGET}/stdlib ${LIBCSRC}/stdlib +.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -14,8 +14,8 @@ system.c tdelete.c tfind.c tsearch.c twalk.c # machine-dependent stdlib sources -.if exists(${LIBCSRC}/${TARGET}/stdlib/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/stdlib/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" .endif MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ ==== //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp # $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $ -.PATH: ${LIBCSRC}/stdtime ${LIBCSRC}/../locale +.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \ time32.c ==== //depot/projects/hammer/lib/libc/string/Makefile.inc#8 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34 2004/01/13 16:05:47 des Exp $ -.PATH: ${LIBCSRC}/${TARGET}/string ${LIBCSRC}/string +.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string -CFLAGS+= -I${LIBCSRC}/locale +CFLAGS+= -I${.CURDIR}/locale # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ @@ -22,8 +22,8 @@ # machine-dependent string sources -.if exists(${LIBCSRC}/${TARGET}/string/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/string/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" .endif MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ ==== //depot/projects/hammer/lib/libc/uuid/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # DCE 1.1 UUID implementation sources -.PATH: ${LIBCSRC}/uuid +.PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c ==== //depot/projects/hammer/lib/libc/xdr/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $ -.PATH: ${LIBCSRC}/xdr ${LIBCSRC}/. +.PATH: ${.CURDIR}/xdr ${.CURDIR}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_stdio.c ==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $ # yp sources -.PATH: ${LIBCSRC}/yp +.PATH: ${.CURDIR}/yp SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c ==== //depot/projects/hammer/libexec/Makefile#22 (text+ko) ==== @@ -27,7 +27,6 @@ rpc.sprayd \ rshd \ ${_rtld-elf} \ - ${_rtld-elf32} \ save-entropy \ ${_smrsh} \ talkd \ @@ -46,9 +45,6 @@ .if !defined(NOPIC) _rtld-elf= rtld-elf -.if ${MACHINE_ARCH} == "amd64" -_rtld-elf32= rtld-elf32 -.endif .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/libexec/rtld-elf/Makefile#9 (text+ko) ==== @@ -5,10 +5,8 @@ xmalloc.c debug.c reloc.c libmap.c MAN= rtld.1 CSTD?= gnu99 -TARGET?= ${MACHINE_ARCH} -RTLDSRC?= ${.CURDIR} CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${RTLDSRC}/${TARGET} -I${RTLDSRC} +CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} LDFLAGS+= -nostdlib -e .rtld_start INSTALLFLAGS= -fschg -C -b BINDIR= /libexec @@ -16,8 +14,8 @@ MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 -.if exists(${RTLDSRC}/${TARGET}/Makefile.inc) -.include "${RTLDSRC}/${TARGET}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" .endif # If LDSCRIPT is defined, we build the dynamic linker as an @@ -50,6 +48,6 @@ beforeinstall: -chflags noschg ${DESTDIR}/usr/libexec/${PROG} -.PATH: ${RTLDSRC} ${RTLDSRC}/${TARGET} +.PATH: ${.CURDIR}/${MACHINE_ARCH} .include ==== //depot/projects/hammer/share/mk/bsd.lib.mk#17 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:12:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B991F16A4D0; Fri, 19 Mar 2004 16:12:47 -0800 (PST) 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 9139E16A4CE for ; Fri, 19 Mar 2004 16:12:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71ADB43D1D for ; Fri, 19 Mar 2004 16:12:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K0ClGe019717 for ; Fri, 19 Mar 2004 16:12:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K0Ckbs019714 for perforce@freebsd.org; Fri, 19 Mar 2004 16:12:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:12:46 -0800 (PST) Message-Id: <200403200012.i2K0Ckbs019714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=49317 Change 49317 by peter@peter_overcee on 2004/03/19 16:12:25 check in what I've been using to build a 32 bit library set. I have changed things since last testing it, so I'll need to retest it again. Affected files ... .. //depot/projects/hammer/build32.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:54:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4A0416A4D0; Fri, 19 Mar 2004 16:54:38 -0800 (PST) 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 7E93D16A4CE for ; Fri, 19 Mar 2004 16:54:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76D9443D39 for ; Fri, 19 Mar 2004 16:54:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K0scGe033867 for ; Fri, 19 Mar 2004 16:54:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K0sbdv033864 for perforce@freebsd.org; Fri, 19 Mar 2004 16:54:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:54:37 -0800 (PST) Message-Id: <200403200054.i2K0sbdv033864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=49318 Change 49318 by peter@peter_overcee on 2004/03/19 16:54:34 missed a bit of the backout Affected files ... .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#14 edit Differences ... ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#14 (text+ko) ==== @@ -2,19 +2,19 @@ # $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.111 2004/03/16 11:06:31 tjr Exp $ # sys sources -.PATH: ${LIBCSRC}/${TARGET}/sys ${LIBCSRC}/sys +.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys # Include the generated makefile containing the *complete* list # of syscall names in MIASM. -.include "${LIBCSRC}/../../sys/sys/syscall.mk" +.include "${.CURDIR}/../../sys/sys/syscall.mk" # Include machine dependent definitions. # # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.if exists(${LIBCSRC}/${TARGET}/sys/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/sys/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc" .endif # Sources common to both syscall interfaces: From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:55:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF88D16A4D0; Fri, 19 Mar 2004 16:55:40 -0800 (PST) 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 B68C416A4CE for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9748043D1F for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K0teGe033940 for ; Fri, 19 Mar 2004 16:55:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K0tdOI033936 for perforce@freebsd.org; Fri, 19 Mar 2004 16:55:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:55:39 -0800 (PST) Message-Id: <200403200055.i2K0tdOI033936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=49319 Change 49319 by peter@peter_overcee on 2004/03/19 16:55:27 hack around libgnuregex bogusness Affected files ... .. //depot/projects/hammer/build32.sh#2 edit Differences ... ==== //depot/projects/hammer/build32.sh#2 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#1 $ +# $P4: //depot/projects/hammer/build32.sh#2 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -7,7 +7,12 @@ # # Its purpose is to build a 32 bit library set and a ld-elf32.so.1. +# XXX beware.. some of the library targets have no way to disable +# XXX installation of includes. ie: it will re-install some files in +# XXX /usr/include for you. + # Set up an obj tree +chflags -R noschg /tmp/i386 rm -rf /tmp/i386 # and a place to put the alternate include tree into. @@ -24,6 +29,8 @@ # Now the libraries. This doesn't work for bind and stdc++ yet. hence -k make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries +(cd gnu/lib/libregex; make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include/gnu -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) + # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf make -DNOMAN -DNODOC -DNOINFO PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32 -DCOMPAT_32BIT" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" obj From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:00:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE21816A4D0; Fri, 19 Mar 2004 17:00:47 -0800 (PST) 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 C772316A4CE for ; Fri, 19 Mar 2004 17:00:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE79C43D2F for ; Fri, 19 Mar 2004 17:00:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K10lGe034234 for ; Fri, 19 Mar 2004 17:00:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K10k9Q034227 for perforce@freebsd.org; Fri, 19 Mar 2004 17:00:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:00:46 -0800 (PST) Message-Id: <200403200100.i2K10k9Q034227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:00:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=49320 Change 49320 by peter@peter_overcee on 2004/03/19 17:00:19 add -32 option to ldconfig. ugh! Affected files ... .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#4 edit Differences ... ==== //depot/projects/hammer/sbin/ldconfig/ldconfig.c#4 (text+ko) ==== @@ -63,6 +63,9 @@ #define _PATH_ELF_HINTS "./ld-elf.so.hints" #endif +#define _PATH_LD32_HINTS "/var/run/ld32.so.hints" +#define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" + #undef major #undef minor @@ -102,20 +105,31 @@ { int i, c; int rval = 0; - int is_aout; + int is_aout = 0; + int is_32 = 0; - is_aout = 0; - if (argc > 1 && strcmp(argv[1], "-aout") == 0) { - is_aout = 1; - argc--; - argv++; - } else if (argc > 1 && strcmp(argv[1], "-elf") == 0) { - /* skip over legacy -elf arg */ - argc--; - argv++; + while (argc > 1) { + if (strcmp(argv[1], "-aout") == 0) { + is_aout = 1; + argc--; + argv++; + } else if (strcmp(argv[1], "-elf") == 0) { + is_aout = 0; + argc--; + argv++; + } else if (strcmp(argv[1], "-32") == 0) { + is_32 = 1; + argc--; + argv++; + } else { + break; + } } - hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; + if (is_32) + hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS; + else + hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; if (argc == 1) rescan = 1; else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) { From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:03:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B90A16A4D1; Fri, 19 Mar 2004 17:03:52 -0800 (PST) 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 3F5E416A4CF for ; Fri, 19 Mar 2004 17:03:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3755143D3F for ; Fri, 19 Mar 2004 17:03:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K13pGe036922 for ; Fri, 19 Mar 2004 17:03:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K13pIT036919 for perforce@freebsd.org; Fri, 19 Mar 2004 17:03:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:03:51 -0800 (PST) Message-Id: <200403200103.i2K13pIT036919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:03:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=49321 Change 49321 by peter@peter_overcee on 2004/03/19 17:03:26 update comments. Affected files ... .. //depot/projects/hammer/build32.sh#3 edit Differences ... ==== //depot/projects/hammer/build32.sh#3 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#2 $ +# $P4: //depot/projects/hammer/build32.sh#3 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -23,12 +23,13 @@ make MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 obj make MAKEOBJDIRPREFIX=/tmp/i386 DESTDIR=/tmp/i386/root MACHINE_ARCH=i386 includes -# libncurses needs a build-tools pass first. +# libncurses needs a build-tools pass first. I wish build-tools was a recursive target. (cd lib/libncurses; make MAKEOBJDIRPREFIX=/tmp/i386 build-tools) # Now the libraries. This doesn't work for bind and stdc++ yet. hence -k make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries +# Hack to fix gnuregex which does evil hacks to the -I paths. (cd gnu/lib/libregex; make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include/gnu -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) # and now that we have enough libraries, build ld-elf32.so.1 From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:06:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B054116A4D0; Fri, 19 Mar 2004 17:06:56 -0800 (PST) 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 8873716A4CE for ; Fri, 19 Mar 2004 17:06:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8121043D41 for ; Fri, 19 Mar 2004 17:06:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K16uGe037069 for ; Fri, 19 Mar 2004 17:06:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K16u4s037066 for perforce@freebsd.org; Fri, 19 Mar 2004 17:06:56 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:06:56 -0800 (PST) Message-Id: <200403200106.i2K16u4s037066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:06:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=49322 Change 49322 by peter@peter_overcee on 2004/03/19 17:06:12 another update. note that libstdc++ is the only holdout. Affected files ... .. //depot/projects/hammer/build32.sh#4 edit Differences ... ==== //depot/projects/hammer/build32.sh#4 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#3 $ +# $P4: //depot/projects/hammer/build32.sh#4 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -26,9 +26,11 @@ # libncurses needs a build-tools pass first. I wish build-tools was a recursive target. (cd lib/libncurses; make MAKEOBJDIRPREFIX=/tmp/i386 build-tools) -# Now the libraries. This doesn't work for bind and stdc++ yet. hence -k +# Now the libraries. This doesn't work for bind, gnuregex and stdc++ yet. hence -k make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -k libraries +# bind isn't a problem, its an internal no-install lib, so let it fail. +# libstdc++ is a curious one. it looks like "c++ -m32" doesn't work. # Hack to fix gnuregex which does evil hacks to the -I paths. (cd gnu/lib/libregex; make -DNOMAN -DNODOC -DNOINFO MAKEOBJDIRPREFIX=/tmp/i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 MACHINE_ARCH=i386 CC="cc -m32 -I/tmp/i386/root/usr/include/gnu -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" CXX="c++ -m32 -I/tmp/i386/root/usr/include/c++/3.3 -L/usr/lib32 -B/usr/lib32" LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" all install) From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:21:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE8016A4D0; Fri, 19 Mar 2004 17:21:22 -0800 (PST) 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 1F23016A4CE for ; Fri, 19 Mar 2004 17:21:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1794843D2F for ; Fri, 19 Mar 2004 17:21:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K1LLGe040006 for ; Fri, 19 Mar 2004 17:21:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K1LLc1039997 for perforce@freebsd.org; Fri, 19 Mar 2004 17:21:21 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:21:21 -0800 (PST) Message-Id: <200403200121.i2K1LLc1039997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=49324 Change 49324 by peter@peter_overcee on 2004/03/19 17:21:19 remove more cruft that I missed. Affected files ... .. //depot/projects/hammer/share/mk/bsd.lib.mk#18 edit Differences ... ==== //depot/projects/hammer/share/mk/bsd.lib.mk#18 (text+ko) ==== @@ -21,12 +21,6 @@ SONAME?= ${SHLIB_NAME} .endif -.if defined(BUILD_PIC_ONLY) -.undef SHLIB_NAME -.undef SHLIB_LINK -.undef SONAME -.endif - .if defined(CRUNCH_CFLAGS) CFLAGS+= ${CRUNCH_CFLAGS} .endif @@ -106,7 +100,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/} .endif -.if defined(LIB) && !empty(LIB) && !defined(BUILD_PIC_ONLY) +.if defined(LIB) && !empty(LIB) _LIBS= lib${LIB}.a lib${LIB}.a: ${OBJS} ${STATICOBJS} From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:34:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A05116A4D0; Fri, 19 Mar 2004 17:34:59 -0800 (PST) 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 544D116A4CE for ; Fri, 19 Mar 2004 17:34:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 482AE43D45 for ; Fri, 19 Mar 2004 17:34:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K1YxGe042941 for ; Fri, 19 Mar 2004 17:34:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K1YwZN042937 for perforce@freebsd.org; Fri, 19 Mar 2004 17:34:58 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:34:58 -0800 (PST) Message-Id: <200403200134.i2K1YwZN042937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:35:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=49325 Change 49325 by peter@peter_overcee on 2004/03/19 17:34:33 IFC @49308 Affected files ... .. //depot/projects/hammer/Makefile.inc1#46 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fputc.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getchar.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/putc.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/putchar.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#7 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#9 integrate .. //depot/projects/hammer/sys/conf/files#50 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#7 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/md/md.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#12 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#6 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#1 branch .. //depot/projects/hammer/sys/netatalk/ddp_pcb.h#1 branch .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#33 integrate .. //depot/projects/hammer/sys/sys/tree.h#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#46 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.418 2004/03/18 10:17:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.420 2004/03/19 17:57:07 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -257,7 +257,8 @@ .endfor .for _dir in \ lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs + usr/libexec usr/sbin usr/share/misc \ + usr/share/bsnmp/defs usr/share/bsnmp/mibs mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -324,7 +325,7 @@ everything: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4.4: building everything.." + @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-all @@ -465,13 +466,13 @@ cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy @echo @echo "--------------------------------------------------------------" - @echo ">>> Installing everything.." + @echo ">>> Installing everything" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install redistribute: @echo "--------------------------------------------------------------" - @echo ">>> Distributing everything.." + @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute ==== //depot/projects/hammer/lib/libc/stdio/fgetc.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fgetc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.11 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.12 2004/03/19 09:04:56 tjr Exp $"); #include "namespace.h" #include @@ -52,7 +52,8 @@ { int retval; FLOCKFILE(fp); - ORIENT(fp, -1); + /* Orientation set by __sgetc() when buffer is empty. */ + /* ORIENT(fp, -1); */ retval = __sgetc(fp); FUNLOCKFILE(fp); return (retval); ==== //depot/projects/hammer/lib/libc/stdio/fputc.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fputc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.12 2004/03/10 10:49:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $"); #include "namespace.h" #include @@ -53,7 +53,8 @@ { int retval; FLOCKFILE(fp); - ORIENT(fp, -1); + /* Orientation set by __sputc() when buffer is full. */ + /* ORIENT(fp, -1); */ retval = __sputc(c, fp); FUNLOCKFILE(fp); return (retval); ==== //depot/projects/hammer/lib/libc/stdio/getc.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.12 2004/03/17 01:43:07 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $"); #include "namespace.h" #include @@ -53,7 +53,8 @@ { int retval; FLOCKFILE(fp); - ORIENT(fp, -1); + /* Orientation set by __sgetc() when buffer is empty. */ + /* ORIENT(fp, -1); */ retval = __sgetc(fp); FUNLOCKFILE(fp); return (retval); ==== //depot/projects/hammer/lib/libc/stdio/getchar.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.11 2004/03/10 10:24:15 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.12 2004/03/19 09:04:56 tjr Exp $"); /* * A subroutine version of the macro getchar. @@ -56,7 +56,8 @@ { int retval; FLOCKFILE(stdin); - ORIENT(stdin, -1); + /* Orientation set by __sgetc() when buffer is empty. */ + /* ORIENT(stdin, -1); */ retval = __sgetc(stdin); FUNLOCKFILE(stdin); return (retval); ==== //depot/projects/hammer/lib/libc/stdio/putc.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)putc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.12 2004/03/17 01:43:07 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $"); #include "namespace.h" #include @@ -55,7 +55,8 @@ { int retval; FLOCKFILE(fp); - ORIENT(fp, -1); + /* Orientation set by __sputc() when buffer is full. */ + /* ORIENT(fp, -1); */ retval = __sputc(c, fp); FUNLOCKFILE(fp); return (retval); ==== //depot/projects/hammer/lib/libc/stdio/putchar.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)putchar.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.12 2004/03/17 01:43:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.13 2004/03/19 09:04:56 tjr Exp $"); #include "namespace.h" #include @@ -59,7 +59,8 @@ FILE *so = stdout; FLOCKFILE(so); - ORIENT(so, -1); + /* Orientation set by __sputc() when buffer is full. */ + /* ORIENT(so, -1); */ retval = __sputc(c, so); FUNLOCKFILE(so); return (retval); ==== //depot/projects/hammer/lib/libc/sys/select.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)select.2 8.2 (Berkeley) 3/25/94 -.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.27 2004/03/03 14:51:11 dds Exp $ +.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.28 2004/03/19 16:04:11 dds Exp $ .\" .Dd November 17, 2002 .Dt SELECT 2 @@ -150,9 +150,7 @@ One of the descriptor sets specified an invalid descriptor. .It Bq Er EFAULT One of the arguments -.Fa readfds , -.Fa writefds , -.Fa exceptfds , +.Fa readfds , writefds , exceptfds , or .Fa timeout points to an invalid address. ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.13 2004/03/18 00:18:45 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.14 2004/03/19 03:28:38 obrien Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" ==== //depot/projects/hammer/sys/conf/files#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.875 2004/03/16 12:23:38 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.876 2004/03/19 07:21:22 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1237,6 +1237,7 @@ netatalk/at_rmx.c optional netatalkdebug netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk +netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk netatm/atm_aal5.c optional atm_core netatm/atm_cm.c optional atm_core ==== //depot/projects/hammer/sys/conf/kern.pre.mk#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.45 2004/03/18 18:05:08 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.47 2004/03/19 17:40:45 obrien Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -18,10 +18,12 @@ .if ${CC} == "icc" COPTFLAGS?=-O -.elif ${MACHINE_ARCH} == "amd64" -COPTFLAGS?=-O2 -fno-strict-aliasing -frename-registers -pipe .else +. if ${MACHINE_ARCH} == "amd64" +COPTFLAGS?=-O2 -frename-registers -pipe +. else COPTFLAGS?=-O -pipe +. endif . if ${COPTFLAGS:M-O[23s]} != "" COPTFLAGS+= -fno-strict-aliasing . endif ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#27 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.127 2004/03/18 18:42:22 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.128 2004/03/19 07:05:01 njl Exp $ */ #include "opt_acpi.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -132,6 +133,7 @@ void *context, void **status); static void acpi_shutdown_pre_sync(void *arg, int howto); static void acpi_shutdown_final(void *arg, int howto); +static void acpi_shutdown_poweroff(void *arg); static void acpi_enable_fixed_events(struct acpi_softc *sc); static void acpi_system_eventhandler_sleep(void *arg, int state); static void acpi_system_eventhandler_wakeup(void *arg, int state); @@ -1177,26 +1179,17 @@ static void acpi_shutdown_final(void *arg, int howto) { - ACPI_STATUS status; ACPI_ASSERTLOCK; + /* + * If powering off, run the actual shutdown code on each processor. + * It will only perform the shutdown on the BSP. Some chipsets do + * not power off the system correctly if called from an AP. + */ if ((howto & RB_POWEROFF) != 0) { printf("Powering system off using ACPI\n"); - status = AcpiEnterSleepStatePrep(acpi_off_state); - if (ACPI_FAILURE(status)) { - printf("AcpiEnterSleepStatePrep failed - %s\n", - AcpiFormatException(status)); - return; - } - ACPI_DISABLE_IRQS(); - status = AcpiEnterSleepState(acpi_off_state); - if (ACPI_FAILURE(status)) { - printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); - } else { - DELAY(1000000); - printf("ACPI power-off failed - timeout\n"); - } + smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL); } else { printf("Shutting down ACPI\n"); AcpiTerminate(); @@ -1204,6 +1197,33 @@ } static void +acpi_shutdown_poweroff(void *arg) +{ + ACPI_STATUS status; + + ACPI_ASSERTLOCK; + + /* Only attempt to power off if this is the BSP (cpuid 0). */ + if (PCPU_GET(cpuid) != 0) + return; + + status = AcpiEnterSleepStatePrep(acpi_off_state); + if (ACPI_FAILURE(status)) { + printf("AcpiEnterSleepStatePrep failed - %s\n", + AcpiFormatException(status)); + return; + } + ACPI_DISABLE_IRQS(); + status = AcpiEnterSleepState(acpi_off_state); + if (ACPI_FAILURE(status)) { + printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); + } else { + DELAY(1000000); + printf("ACPI power-off failed - timeout\n"); + } +} + +static void acpi_enable_fixed_events(struct acpi_softc *sc) { static int first_time = 1; ==== //depot/projects/hammer/sys/dev/ips/ips.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.6 2004/02/28 19:14:41 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.7 2004/03/19 17:36:47 scottl Exp $ */ @@ -54,8 +54,10 @@ * IPS CONSTANTS */ #define IPS_VENDOR_ID 0x1014 +#define IPS_VENDOR_ID_ADAPTEC 0x9005 #define IPS_MORPHEUS_DEVICE_ID 0x01BD #define IPS_COPPERHEAD_DEVICE_ID 0x002E +#define IPS_MARCO_DEVICE_ID 0x0950 #define IPS_CSL 0xff #define IPS_POCL 0x30 ==== //depot/projects/hammer/sys/dev/ips/ips_pci.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.9 2004/03/17 17:50:35 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.10 2004/03/19 17:36:47 scottl Exp $"); #include @@ -45,7 +45,11 @@ (pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)) { device_set_desc(dev, "IBM ServeRAID Adapter"); return (0); - } + } else if ((pci_get_vendor(dev) == IPS_VENDOR_ID_ADAPTEC) && + (pci_get_device(dev) == IPS_MARCO_DEVICE_ID)) { + device_set_desc(dev, "Adaptec ServeRAID Adapter"); + return (0); + } return(ENXIO); } @@ -77,6 +81,10 @@ sc->ips_adapter_reinit = ips_copperhead_reinit; sc->ips_adapter_intr = ips_copperhead_intr; sc->ips_issue_cmd = ips_issue_copperhead_cmd; + } else if (pci_get_device(dev) == IPS_MARCO_DEVICE_ID){ + sc->ips_adapter_reinit = ips_morpheus_reinit; + sc->ips_adapter_intr = ips_morpheus_intr; + sc->ips_issue_cmd = ips_issue_morpheus_cmd; } else goto error; /* make sure busmastering is on */ @@ -87,10 +95,10 @@ sc->iores = NULL; if(command & PCIM_CMD_MEMEN){ PRINTF(10, "trying MEMIO\n"); - if(pci_get_device(dev) == IPS_MORPHEUS_DEVICE_ID) - sc->rid = PCIR_BAR(0); + if(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID) + sc->rid = PCIR_BAR(1); else - sc->rid = PCIR_BAR(1); + sc->rid = PCIR_BAR(0); sc->iotype = SYS_RES_MEMORY; sc->iores = bus_alloc_resource_any(dev, sc->iotype, &sc->rid, RF_ACTIVE); ==== //depot/projects/hammer/sys/dev/md/md.c#27 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.117 2004/03/18 18:23:37 alc Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.118 2004/03/19 21:19:15 alc Exp $ * */ @@ -517,92 +517,78 @@ return (error); } -#include -#include - static int mdstart_swap(struct md_s *sc, struct bio *bp) { - { - struct sf_buf *sf; - int i, rv; - int offs, len, lastp, lastend; - vm_page_t m; - u_char *p; + struct sf_buf *sf; + int i, rv; + int offs, len, lastp, lastend; + vm_page_t m; + u_char *p; + + p = bp->bio_data; - p = bp->bio_data; + /* + * offs is the ofset at whih to start operating on the + * next (ie, first) page. lastp is the last page on + * which we're going to operate. lastend is the ending + * position within that last page (ie, PAGE_SIZE if + * we're operating on complete aligned pages). + */ + offs = bp->bio_offset % PAGE_SIZE; + lastp = (bp->bio_offset + bp->bio_length - 1) / PAGE_SIZE; + lastend = (bp->bio_offset + bp->bio_length - 1) % PAGE_SIZE + 1; - /* - * offs is the ofset at whih to start operating on the - * next (ie, first) page. lastp is the last page on - * which we're going to operate. lastend is the ending - * position within that last page (ie, PAGE_SIZE if - * we're operating on complete aligned pages). - */ - offs = bp->bio_offset % PAGE_SIZE; - lastp = (bp->bio_offset + bp->bio_length - 1) / PAGE_SIZE; - lastend = (bp->bio_offset + bp->bio_length - 1) % PAGE_SIZE + 1; + VM_OBJECT_LOCK(sc->object); + vm_object_pip_add(sc->object, 1); + for (i = bp->bio_offset / PAGE_SIZE; i <= lastp; i++) { + len = ((i == lastp) ? lastend : PAGE_SIZE) - offs; + m = vm_page_grab(sc->object, i, + VM_ALLOC_NORMAL|VM_ALLOC_RETRY); + VM_OBJECT_UNLOCK(sc->object); + sf = sf_buf_alloc(m); VM_OBJECT_LOCK(sc->object); - vm_object_pip_add(sc->object, 1); - for (i = bp->bio_offset / PAGE_SIZE; i <= lastp; i++) { - len = ((i == lastp) ? lastend : PAGE_SIZE) - offs; - - m = vm_page_grab(sc->object, i, - VM_ALLOC_NORMAL|VM_ALLOC_RETRY); - VM_OBJECT_UNLOCK(sc->object); - sf = sf_buf_alloc(m); - VM_OBJECT_LOCK(sc->object); - if (bp->bio_cmd == BIO_READ) { - if (m->valid != VM_PAGE_BITS_ALL) { - rv = vm_pager_get_pages(sc->object, - &m, 1, 0); - } - bcopy((void *)(sf_buf_kva(sf) + offs), p, len); - } else if (bp->bio_cmd == BIO_WRITE) { - if (len != PAGE_SIZE && m->valid != - VM_PAGE_BITS_ALL) { - rv = vm_pager_get_pages(sc->object, - &m, 1, 0); - } - bcopy(p, (void *)(sf_buf_kva(sf) + offs), len); - m->valid = VM_PAGE_BITS_ALL; + if (bp->bio_cmd == BIO_READ) { + if (m->valid != VM_PAGE_BITS_ALL) + rv = vm_pager_get_pages(sc->object, &m, 1, 0); + bcopy((void *)(sf_buf_kva(sf) + offs), p, len); + } else if (bp->bio_cmd == BIO_WRITE) { + if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL) + rv = vm_pager_get_pages(sc->object, &m, 1, 0); + bcopy(p, (void *)(sf_buf_kva(sf) + offs), len); + m->valid = VM_PAGE_BITS_ALL; #if 0 - } else if (bp->bio_cmd == BIO_DELETE) { - if (len != PAGE_SIZE && m->valid != - VM_PAGE_BITS_ALL) { - rv = vm_pager_get_pages(sc->object, - &m, 1, 0); - } - bzero((void *)(sf_buf_kva(sf) + offs), len); - vm_page_dirty(m); - m->valid = VM_PAGE_BITS_ALL; + } else if (bp->bio_cmd == BIO_DELETE) { + if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL) + rv = vm_pager_get_pages(sc->object, &m, 1, 0); + bzero((void *)(sf_buf_kva(sf) + offs), len); + vm_page_dirty(m); + m->valid = VM_PAGE_BITS_ALL; #endif - } - sf_buf_free(sf); - vm_page_lock_queues(); - vm_page_wakeup(m); - vm_page_activate(m); - if (bp->bio_cmd == BIO_WRITE) { - vm_page_dirty(m); - } - vm_page_unlock_queues(); + } + sf_buf_free(sf); + vm_page_lock_queues(); + vm_page_wakeup(m); + vm_page_activate(m); + if (bp->bio_cmd == BIO_WRITE) + vm_page_dirty(m); + vm_page_unlock_queues(); - /* Actions on further pages start at offset 0 */ - p += PAGE_SIZE - offs; - offs = 0; + /* Actions on further pages start at offset 0 */ + p += PAGE_SIZE - offs; + offs = 0; #if 0 if (bootverbose || bp->bio_offset / PAGE_SIZE < 17) printf("wire_count %d busy %d flags %x hold_count %d act_count %d queue %d valid %d dirty %d @ %d\n", m->wire_count, m->busy, m->flags, m->hold_count, m->act_count, m->queue, m->valid, m->dirty, i); #endif - } - vm_object_pip_subtract(sc->object, 1); - vm_object_set_writeable_dirty(sc->object); - VM_OBJECT_UNLOCK(sc->object); - return (0); } + vm_object_pip_subtract(sc->object, 1); + vm_object_set_writeable_dirty(sc->object); + VM_OBJECT_UNLOCK(sc->object); + return (0); } static void ==== //depot/projects/hammer/sys/dev/usb/ehci.c#5 (text+ko) ==== @@ -2,6 +2,7 @@ /* Also ported from NetBSD: * $NetBSD: ehci.c,v 1.50 2003/10/18 04:50:35 simonb Exp $ + * $NetBSD: ehci.c,v 1.54 2004/01/17 13:15:05 jdolecek Exp $ */ /* @@ -10,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.5 2003/11/10 00:20:52 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.6 2004/03/19 07:14:23 julian Exp $"); /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -58,6 +59,28 @@ * */ +/* + * TODO: + * 1) hold off explorations by companion controllers until ehci has started. + * + * 2) The EHCI driver lacks support for interrupt isochronous transfers, so + * devices using them don't work. + * Interrupt transfers are not difficult, it's just not done. + * + * 3) There might also be some issues with the data toggle, it was not + * completely tested to work properly under all condistions. If wrong + * toggle would be sent/recvd, bulk data transfers would stop working. + * + * 4) The meaty part to implement is the support for USB 2.0 hubs. + * They are quite compolicated since the need to be able to do + * "transaction translation", i.e., converting to/from USB 2 and USB 1. + * So the hub driver needs to handle and schedule these things, to + * assign place in frame where different devices get to go. See chapter + * on hubs in USB 2.0 for details. + * + * 5) command failures are not recovered correctly +*/ + #include #include #include @@ -99,6 +122,7 @@ #endif #ifdef USB_DEBUG +#define EHCI_DEBUG USB_DEBUG #define DPRINTF(x) if (ehcidebug) logprintf x #define DPRINTFN(n,x) if (ehcidebug>(n)) logprintf x int ehcidebug = 0; @@ -226,7 +250,7 @@ Static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *); Static void ehci_abort_xfer(usbd_xfer_handle, usbd_status); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG Static void ehci_dump_regs(ehci_softc_t *); void ehci_dump(void); Static ehci_softc_t *theehci; @@ -326,7 +350,7 @@ ehci_soft_qh_t *sqh; DPRINTF(("ehci_init: start\n")); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG theehci = sc; #endif @@ -424,7 +448,7 @@ sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; sqh->qh.qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED); sqh->sqtd = NULL; -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug) { ehci_dump_sqh(sqh); } @@ -617,7 +641,7 @@ ehci_softintr(void *v) { ehci_softc_t *sc = v; - struct ehci_xfer *ex; + struct ehci_xfer *ex, *nextex; DPRINTFN(10,("%s: ehci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev), sc->sc_bus.intr_context)); @@ -630,8 +654,10 @@ * An interrupt just tells us that something is done, we have no * clue what, so we need to scan through all active transfers. :-( */ - for (ex = LIST_FIRST(&sc->sc_intrhead); ex; ex = LIST_NEXT(ex, inext)) + for (ex = LIST_FIRST(&sc->sc_intrhead); ex; ex = nextex) { + nextex = LIST_NEXT(ex, inext); ehci_check_intr(sc, ex); + } #ifdef USB_USE_SOFTINTR if (sc->sc_softwake) { @@ -696,7 +722,7 @@ ehci_idone(struct ehci_xfer *ex) { usbd_xfer_handle xfer = &ex->xfer; -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe; #endif ehci_soft_qtd_t *sqtd; @@ -709,7 +735,7 @@ int s = splhigh(); if (ex->isdone) { splx(s); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG printf("ehci_idone: ex is done!\n "); ehci_dump_exfer(ex); #else @@ -728,7 +754,7 @@ return; } -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG DPRINTFN(/*10*/2, ("ehci_idone: xfer=%p, pipe=%p ready\n", xfer, epipe)); if (ehcidebug > 10) ehci_dump_sqtds(ex->sqtdstart); @@ -742,6 +768,10 @@ break; status = nstatus; + /* halt is ok if descriptor is last, and complete */ + if (sqtd->qtd.qtd_next == EHCI_NULL && + EHCI_QTD_GET_BYTES(status) == 0) + status &= ~EHCI_QTD_HALTED; if (EHCI_QTD_GET_PID(status) != EHCI_QTD_PID_SETUP) actlen += sqtd->len - EHCI_QTD_GET_BYTES(status); } @@ -760,7 +790,7 @@ xfer->length, actlen, status)); xfer->actlen = actlen; if (status != 0) { -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG char sbuf[128]; bitmask_snprintf((u_int32_t)status, @@ -811,7 +841,7 @@ intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS)) & sc->sc_eintrs; DPRINTFN(15,("ehci_waitintr: 0x%04x\n", intrs)); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 15) ehci_dump_regs(sc); #endif @@ -833,7 +863,7 @@ ehci_poll(struct usbd_bus *bus) { ehci_softc_t *sc = (ehci_softc_t *)bus; -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG static int last; int new; new = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS)); @@ -910,7 +940,7 @@ //u_int32_t ctl; int s; -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG DPRINTF(("ehci_power: sc=%p, why=%d\n", sc, why)); ehci_dump_regs(sc); #endif @@ -992,7 +1022,7 @@ usbd_status err; err = usb_allocmem(bus, size, 0, dma); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (err) printf("ehci_allocm: usb_allocmem()=%d\n", err); #endif @@ -1072,7 +1102,7 @@ { } -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG void ehci_dump_regs(ehci_softc_t *sc) { @@ -1276,7 +1306,7 @@ case UE_CONTROL: err = usb_allocmem(&sc->sc_bus, sizeof(usb_device_request_t), 0, &epipe->u.ctl.reqdma); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (err) printf("ehci_open: usb_allocmem()=%d\n", err); #endif @@ -1323,7 +1353,7 @@ head->next = sqh; head->qh.qh_link = htole32(sqh->physaddr | EHCI_LINK_QH); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 5) { printf("ehci_add_qh:\n"); ehci_dump_sqh(sqh); @@ -1739,7 +1769,7 @@ #endif break; case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE): - if (value != 0) { + if ((value & 0xff) != 0) { err = USBD_IOERROR; goto ret; } @@ -2020,7 +2050,7 @@ DPRINTFN(2, ("ehci_alloc_sqh: allocating chunk\n")); err = usb_allocmem(&sc->sc_bus, EHCI_SQH_SIZE * EHCI_SQH_CHUNK, EHCI_PAGE_SIZE, &dma); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (err) printf("ehci_alloc_sqh: usb_allocmem()=%d\n", err); #endif @@ -2061,7 +2091,7 @@ DPRINTFN(2, ("ehci_alloc_sqtd: allocating chunk\n")); err = usb_allocmem(&sc->sc_bus, EHCI_SQTD_SIZE*EHCI_SQTD_CHUNK, EHCI_PAGE_SIZE, &dma); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (err) printf("ehci_alloc_sqtd: usb_allocmem()=%d\n", err); #endif @@ -2202,6 +2232,7 @@ if (i != 0) /* use offset only in first buffer */ a = EHCI_PAGE(a); cur->qtd.qtd_buffer[i] = htole32(a); + cur->qtd.qtd_buffer_hi[i] = 0; #ifdef DIAGNOSTIC if (i >= EHCI_QTD_NBUFFERS) { printf("ehci_alloc_sqtd_chain: i=%d\n", i); @@ -2587,6 +2618,7 @@ EHCI_QTD_SET_BYTES(sizeof *req) ); setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->u.ctl.reqdma, 0)); + setup->qtd.qtd_buffer_hi[0] = 0; setup->nextqtd = next; setup->qtd.qtd_next = setup->qtd.qtd_altnext = htole32(next->physaddr); setup->xfer = xfer; @@ -2599,12 +2631,13 @@ EHCI_QTD_IOC ); stat->qtd.qtd_buffer[0] = 0; /* XXX not needed? */ + stat->qtd.qtd_buffer_hi[0] = 0; /* XXX not needed? */ stat->nextqtd = NULL; stat->qtd.qtd_next = stat->qtd.qtd_altnext = EHCI_NULL; stat->xfer = xfer; stat->len = 0; -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 5) { DPRINTF(("ehci_device_request:\n")); ehci_dump_sqh(sqh); @@ -2632,7 +2665,7 @@ xfer->status = USBD_IN_PROGRESS; splx(s); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 10) { DPRINTF(("ehci_device_request: status=%x\n", EOREAD4(sc, EHCI_USBSTS))); @@ -2714,7 +2747,7 @@ return (err); } -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 5) { DPRINTF(("ehci_device_bulk_transfer: data(1)\n")); ehci_dump_sqh(sqh); @@ -2742,7 +2775,7 @@ xfer->status = USBD_IN_PROGRESS; splx(s); -#ifdef USB_DEBUG +#ifdef EHCI_DEBUG if (ehcidebug > 10) { DPRINTF(("ehci_device_bulk_transfer: data(2)\n")); delay(10000); ==== //depot/projects/hammer/sys/dev/usb/ehcireg.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ehcireg.h,v 1.13 2001/11/23 01:16:27 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.1 2003/04/14 14:04:07 ticso Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.2 2004/03/19 07:14:23 julian Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -235,6 +235,7 @@ #define EHCI_QTD_GET_TOGGLE(x) (((x) >> 31) & 0x1) #define EHCI_QTD_TOGGLE 0x80000000 ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS]; + ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS]; } ehci_qtd_t; #define EHCI_QTD_ALIGN 32 ==== //depot/projects/hammer/sys/dev/usb/usb_subr.c#7 (text+ko) ==== @@ -3,10 +3,11 @@ /* Also already have from NetBSD: * $NetBSD: usb_subr.c,v 1.102 2003/01/01 16:21:50 augustss Exp $ * $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ + * $NetBSD: usb_subr.c,v 1.111 2004/03/15 10:35:04 augustss Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.59 2004/01/18 12:46:19 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.61 2004/03/19 08:19:52 julian Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -587,7 +588,7 @@ usb_status_t ds; usb_config_descriptor_t cd, *cdp; usbd_status err; - int ifcidx, nifc, len, selfpowered, power; + int i, ifcidx, nifc, len, selfpowered, power; DPRINTFN(5,("usbd_set_config_index: dev=%p index=%d\n", dev, index)); @@ -623,8 +624,14 @@ cdp = malloc(len, M_USB, M_NOWAIT); if (cdp == NULL) return (USBD_NOMEM); - /* Get the full descriptor. */ - err = usbd_get_desc(dev, UDESC_CONFIG, index, len, cdp); + + /* Get the full descriptor. Try a few times for slow devices. */ + for (i = 0; i < 3; i++) { + err = usbd_get_desc(dev, UDESC_CONFIG, index, len, cdp); + if (!err) + break; + usbd_delay_ms(dev, 200); + } if (err) goto bad; if (cdp->bDescriptorType != UDESC_CONFIG) { @@ -775,8 +782,14 @@ return (err); } /* Clear any stall and make sure DATA0 toggle will be used next. */ - if (UE_GET_ADDR(ep->edesc->bEndpointAddress) != USB_CONTROL_ENDPOINT) - usbd_clear_endpoint_stall(p); + if (UE_GET_ADDR(ep->edesc->bEndpointAddress) != USB_CONTROL_ENDPOINT) { + err = usbd_clear_endpoint_stall(p); + /* Some devices reject this command, so ignore a STALL. */ + if (err && err != USBD_STALLED) { + printf("usbd_setup_pipe: failed to start endpoint, %s\n", usbd_errstr(err)); + return (err); + } + } *pipe = p; return (USBD_NORMAL_COMPLETION); } @@ -1030,6 +1043,21 @@ } up->device = dev; + + /* Set the address. Do this early; some devices need that. */ + err = usbd_set_address(dev, addr); + DPRINTFN(5,("usbd_new_device: setting device address=%d\n", addr)); + if (err) { + DPRINTFN(-1,("usb_new_device: set address %d failed\n", addr)); + err = USBD_SET_ADDR_FAILED; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 19 17:39:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4274016A4CF; Fri, 19 Mar 2004 17:39:05 -0800 (PST) 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 10B9E16A4D0 for ; Fri, 19 Mar 2004 17:39:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E28D843D39 for ; Fri, 19 Mar 2004 17:39:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K1d4Ge043112 for ; Fri, 19 Mar 2004 17:39:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K1d4R9043109 for perforce@freebsd.org; Fri, 19 Mar 2004 17:39:04 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 17:39:04 -0800 (PST) Message-Id: <200403200139.i2K1d4R9043109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 01:39:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=49326 Change 49326 by peter@peter_overcee on 2004/03/19 17:38:46 integ -I -b i386_hammer (NOP change this time) Affected files ... .. //depot/projects/hammer/sys/amd64/isa/atpic.c#36 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#10 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.c#10 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Mar 19 19:06:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4555216A4D1; Fri, 19 Mar 2004 19:06:05 -0800 (PST) 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 F39B816A4CE for ; Fri, 19 Mar 2004 19:06:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6A6043D2D for ; Fri, 19 Mar 2004 19:06:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K364Ge063446 for ; Fri, 19 Mar 2004 19:06:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K35uf4063439 for perforce@freebsd.org; Fri, 19 Mar 2004 19:05:56 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Fri, 19 Mar 2004 19:05:56 -0800 (PST) Message-Id: <200403200305.i2K35uf4063439@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 Subject: PERFORCE change 49335 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 03:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=49335 Change 49335 by marcel@marcel_nfs on 2004/03/19 19:05:24 IFC @49328 Affected files ... .. //depot/projects/gdb/Makefile.inc1#5 integrate .. //depot/projects/gdb/UPDATING#6 integrate .. //depot/projects/gdb/UPDATING.64BTT#3 integrate .. //depot/projects/gdb/bin/kill/kill.c#3 integrate .. //depot/projects/gdb/bin/pax/cache.c#2 integrate .. //depot/projects/gdb/bin/ps/ps.1#3 integrate .. //depot/projects/gdb/bin/ps/ps.c#3 integrate .. //depot/projects/gdb/bin/sh/Makefile#4 integrate .. //depot/projects/gdb/contrib/binutils/include/getopt.h#3 delete .. //depot/projects/gdb/contrib/binutils/libiberty/getopt.c#3 delete .. //depot/projects/gdb/contrib/binutils/libiberty/getopt1.c#3 delete .. //depot/projects/gdb/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/gdb/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/gdb/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/gdb/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config#4 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/gdb/crypto/openssl/CHANGES#2 integrate .. //depot/projects/gdb/crypto/openssl/Configure#2 integrate .. //depot/projects/gdb/crypto/openssl/FAQ#2 integrate .. //depot/projects/gdb/crypto/openssl/LICENSE#2 integrate .. //depot/projects/gdb/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/gdb/crypto/openssl/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/NEWS#2 integrate .. //depot/projects/gdb/crypto/openssl/README#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/pkcs7.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/gdb/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/gdb/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/gdb/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/gdb/crypto/openssl/config#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/a_time.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bf/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/bio_cb.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/buffer/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/cast/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/comp/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/conf/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/des/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dh/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dsa/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dso/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/err/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/hmac/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/idea/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/lhash/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/md2/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/md4/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/md5/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/mdc2/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pem/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs12/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rc2/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rc4/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rc5/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ripemd/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rsa/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/sha/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/stack/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/txt_db/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509v3/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/openssl.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/gdb/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/gdb/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/gdb/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/gdb/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/gdb/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/RSA_print.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/des.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/gdb/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_pkt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/gdb/crypto/openssl/test/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/tools/Makefile.ssl#2 integrate .. //depot/projects/gdb/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/gdb/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/gdb/etc/Makefile#4 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#4 integrate .. //depot/projects/gdb/etc/devd.conf#3 integrate .. //depot/projects/gdb/etc/inetd.conf#4 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#4 integrate .. //depot/projects/gdb/etc/rc.d/fsck#4 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#4 integrate .. //depot/projects/gdb/etc/rc.d/mixer#1 branch .. //depot/projects/gdb/etc/rc.d/named#3 integrate .. //depot/projects/gdb/etc/rc.d/ramdisk#1 branch .. //depot/projects/gdb/etc/rc.d/savecore#4 integrate .. //depot/projects/gdb/games/number/number.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/bfd.h#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/patch/patch.1#2 integrate .. //depot/projects/gdb/include/resolv.h#3 integrate .. //depot/projects/gdb/include/stdio.h#2 integrate .. //depot/projects/gdb/lib/libalias/alias.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias.h#3 integrate .. //depot/projects/gdb/lib/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_db.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_ftp.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_irc.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_local.h#3 integrate .. //depot/projects/gdb/lib/libalias/alias_nbt.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_old.c#2 integrate .. //depot/projects/gdb/lib/libalias/alias_pptp.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_proxy.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_skinny.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_smedia.c#3 integrate .. //depot/projects/gdb/lib/libalias/alias_util.c#3 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#3 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_gnutar.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/gdb/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/gdb/lib/libarchive/tar.5#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/flt_rounds.c#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/fpgetround.c#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/fpgetsticky.c#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/fpsetround.c#2 integrate .. //depot/projects/gdb/lib/libc/alpha/gen/fpsetsticky.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/gdb/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/gdb/lib/libc/net/res_send.c#3 integrate .. //depot/projects/gdb/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fileno.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/gdb/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/sys/mount.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/select.2#4 integrate .. //depot/projects/gdb/lib/libdisk/chunk.c#2 integrate .. //depot/projects/gdb/lib/libdisk/create_chunk.c#2 integrate .. //depot/projects/gdb/lib/libdisk/libdisk.3#2 integrate .. //depot/projects/gdb/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/gdb/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/gdb/lib/libdisk/rules.c#2 integrate .. //depot/projects/gdb/lib/libkiconv/xlat16_iconv.c#2 integrate .. //depot/projects/gdb/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/gdb/lib/libpam/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_sigwait.c#2 integrate .. //depot/projects/gdb/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/gdb/lib/msun/src/math.h#2 integrate .. //depot/projects/gdb/libexec/getty/chat.c#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/gdb/rescue/rescue/Makefile#3 integrate .. //depot/projects/gdb/sbin/Makefile#5 integrate .. //depot/projects/gdb/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/gdb/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/gdb/sbin/init/init.c#2 integrate .. //depot/projects/gdb/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/gdb/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/gdb/sbin/raidctl/Makefile#2 delete .. //depot/projects/gdb/sbin/raidctl/raidctl.8#2 delete .. //depot/projects/gdb/sbin/raidctl/raidctl.c#3 delete .. //depot/projects/gdb/sbin/raidctl/rf_configure.c#3 delete .. //depot/projects/gdb/sbin/vinum/commands.c#3 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/CONF_modules_free.3#1 branch .. //depot/projects/gdb/secure/lib/libcrypto/man/CONF_modules_load_file.3#1 branch .. //depot/projects/gdb/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/OPENSSL_config.3#1 branch .. //depot/projects/gdb/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#1 branch .. //depot/projects/gdb/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#6 integrate .. //depot/projects/gdb/share/man/man4/de.4#2 integrate .. //depot/projects/gdb/share/man/man4/firewire.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/gdb/share/man/man4/man4.i386/asc.4#2 delete .. //depot/projects/gdb/share/man/man4/man4.i386/ct.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/gsc.4#2 delete .. //depot/projects/gdb/share/man/man4/man4.i386/le.4#2 delete .. //depot/projects/gdb/share/man/man4/man4.i386/rdp.4#2 delete .. //depot/projects/gdb/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/gdb/share/man/man4/raid.4#2 delete .. //depot/projects/gdb/share/man/man4/uscanner.4#3 integrate .. //depot/projects/gdb/share/man/man5/Makefile#4 integrate .. //depot/projects/gdb/share/man/man5/newsyslog.conf.5#2 delete .. //depot/projects/gdb/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/gdb/share/man/man9/Makefile#5 integrate .. //depot/projects/gdb/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/gdb/share/man/man9/g_access.9#1 branch .. //depot/projects/gdb/share/man/man9/g_attach.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_bio.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_data.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_event.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_geom.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_provider.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/gdb/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/gdb/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/gdb/share/man/man9/vslock.9#2 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/gdb/share/mk/bsd.dep.mk#3 integrate .. //depot/projects/gdb/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/gdb/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/gdb/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/gdb/share/syscons/keymaps/ru.koi8-r.win.kbd#1 branch .. //depot/projects/gdb/share/termcap/termcap.src#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/gdb/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/gdb/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/gdb/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/gdb/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/gdb/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/gdb/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/gdb/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/gdb/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/gdb/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/gdb/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/gdb/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/gdb/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/gdb/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/gdb/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/gdb/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/gdb/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/gdb/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/gdb/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/gdb/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/gdb/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/gdb/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/gdb/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/gdb/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/gdb/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/gdb/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#7 integrate .. //depot/projects/gdb/sys/conf/files#8 integrate .. //depot/projects/gdb/sys/conf/files.i386#6 integrate .. //depot/projects/gdb/sys/conf/files.pc98#5 integrate .. //depot/projects/gdb/sys/conf/kern.mk#4 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#4 integrate .. //depot/projects/gdb/sys/conf/options#7 integrate .. //depot/projects/gdb/sys/conf/options.amd64#3 integrate .. //depot/projects/gdb/sys/conf/options.i386#3 integrate .. //depot/projects/gdb/sys/conf/options.pc98#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/gdb/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/gdb/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/gdb/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/gdb/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/gdb/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/gdb/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/gdb/sys/dev/amd/amd.c#3 integrate .. //depot/projects/gdb/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/an/if_an.c#2 integrate .. //depot/projects/gdb/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/gdb/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/gdb/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/gdb/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/gdb/sys/dev/asr/asr.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/gdb/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/gdb/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/gdb/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/gdb/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/gdb/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/gdb/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/gdb/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/gdb/sys/dev/ct/ct.c#2 integrate .. //depot/projects/gdb/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/gdb/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/gdb/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#3 integrate .. //depot/projects/gdb/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/gdb/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/gdb/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/gx/if_gx.c#3 integrate .. //depot/projects/gdb/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/gdb/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/gdb/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/gdb/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/gdb/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/iir/iir.h#3 integrate .. //depot/projects/gdb/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/ips/ips.h#3 integrate .. //depot/projects/gdb/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/gdb/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/gdb/sys/dev/joy/joy.c#3 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/matcd/matcd_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/mcd/mcd_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/gdb/sys/dev/md/md.c#4 integrate .. //depot/projects/gdb/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/gdb/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/mly/mly.c#4 integrate .. //depot/projects/gdb/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/gdb/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/gdb/sys/dev/my/if_my.c#2 integrate .. //depot/projects/gdb/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/gdb/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/gdb/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/gdb/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/gdb/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/gdb/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/gdb/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/pcic/i82365.c#2 integrate .. //depot/projects/gdb/sys/dev/pcic/i82365_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/gdb/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/gdb/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/gdb/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/gdb/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/gdb/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/gdb/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/gdb/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/gdb/sys/dev/puc/puc.c#2 integrate .. //depot/projects/gdb/sys/dev/raidframe/rf_acctrace.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_alloclist.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_aselect.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_callback.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_chaindecluster.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_copyback.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_cvscan.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagdegrd.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagdegwr.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagffrd.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagffwr.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagfuncs.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagutils.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_debugMem.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_debugprint.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_decluster.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_declusterPQ.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_diskqueue.c#3 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_disks.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_driver.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_engine.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd_dagfuncs.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd_dags.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_fifo.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_freebsdkintf.c#4 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_geniq.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_interdecluster.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_invertq.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_layout.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_map.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_mcpair.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_memchunk.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_nwayxor.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_options.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylog.c#3 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylogDiskMgr.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylogging.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_parityloggingdags.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_parityscan.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pq.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pqdeg.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pqdegdags.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_psstatus.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid0.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid1.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid4.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid5.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid5_rotatedspare.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconbuffer.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconmap.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconstruct.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconutil.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_revent.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_shutdown.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_sstf.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_states.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_stripelocks.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_strutils.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_threadstuff.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_threadstuff.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_types.h#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_utils.c#2 delete .. //depot/projects/gdb/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/gdb/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#3 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#2 integrate .. //depot/projects/gdb/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#4 integrate .. //depot/projects/gdb/sys/dev/safe/safe.c#3 integrate .. //depot/projects/gdb/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/gdb/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/gdb/sys/dev/scd/scd_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/gdb/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#4 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/gdb/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/gdb/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/gdb/sys/dev/snp/snp.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/gusmidi.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/mpu.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/pci/csamidi.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/gdb/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/gdb/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/gdb/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/gdb/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/gdb/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/gdb/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/trm/trm.c#4 integrate .. //depot/projects/gdb/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/gdb/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/gdb/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_subr.c#1 branch .. //depot/projects/gdb/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/gdb/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumvar.h#4 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/gdb/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/gdb/sys/dev/zs/zs_sbus.c#2 integrate .. //depot/projects/gdb/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/gdb/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/gdb/sys/fs/specfs/spec_vnops.c#4 integrate .. //depot/projects/gdb/sys/geom/geom_subr.c#5 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/gdb/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/gdb/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/gdb/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 19 19:11:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8DDA16A4D0; Fri, 19 Mar 2004 19:11:12 -0800 (PST) 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 6043C16A4CE for ; Fri, 19 Mar 2004 19:11:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C8643D1F for ; Fri, 19 Mar 2004 19:11:12 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K3BBGe063975 for ; Fri, 19 Mar 2004 19:11:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K3BBOA063930 for perforce@freebsd.org; Fri, 19 Mar 2004 19:11:11 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Fri, 19 Mar 2004 19:11:11 -0800 (PST) Message-Id: <200403200311.i2K3BBOA063930@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 Subject: PERFORCE change 49336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 03:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=49336 Change 49336 by marcel@marcel_nfs on 2004/03/19 19:10:45 IFC @49328 Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_cpu_ia64.c#2 edit Differences ... ==== //depot/projects/gdb/sys/dev/uart/uart_cpu_ia64.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 Marcel Moolenaar + * Copyright (c) 2003, 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.7 2004/03/20 02:14:02 marcel Exp $"); #include #include @@ -39,6 +39,9 @@ #include #include +bus_space_tag_t uart_bus_space_io = IA64_BUS_SPACE_IO; +bus_space_tag_t uart_bus_space_mem = IA64_BUS_SPACE_MEM; + static int dig64_to_uart_parity[] = { UART_PARITY_NONE, UART_PARITY_NONE, UART_PARITY_EVEN, UART_PARITY_ODD, UART_PARITY_MARK, UART_PARITY_SPACE @@ -57,7 +60,7 @@ struct dig64_hcdp_table *tbl; struct dig64_hcdp_entry *ent; bus_addr_t addr; - unsigned int i, ivar; + unsigned int i; /* * Use the DIG64 HCDP table if present. @@ -80,7 +83,7 @@ di->ops = uart_ns8250_ops; di->bas.chan = 0; di->bas.bst = (ent->address.addr_space == 0) - ? IA64_BUS_SPACE_MEM : IA64_BUS_SPACE_IO; + ? uart_bus_space_mem : uart_bus_space_io; if (bus_space_map(di->bas.bst, addr, 8, 0, &di->bas.bsh) != 0) continue; @@ -98,47 +101,6 @@ /* FALLTHROUGH */ } - /* - * Scan the hints for backward compatibility. We only try units - * 0 to 3 (inclusive). This covers the ISA legacy where 4 UARTs - * had their resources predefined. - */ - for (i = 0; i < 4; i++) { - if (resource_int_value("uart", i, "flags", &ivar)) - continue; - if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) - continue; - if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) - continue; - /* - * We have a possible device. Make sure it's enabled and - * that we have an I/O port. - */ - if (resource_int_value("uart", i, "disabled", &ivar) == 0 && - ivar != 0) - continue; - if (resource_int_value("uart", i, "port", &ivar) != 0 || - ivar == 0) - continue; - /* - * Got it. Fill in the instance and return it. We only have - * ns8250 and successors on i386. - */ - di->ops = uart_ns8250_ops; - di->bas.chan = 0; - di->bas.bst = IA64_BUS_SPACE_IO; - if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0) - continue; - di->bas.regshft = 0; - di->bas.rclk = 0; - if (resource_int_value("uart", i, "baud", &ivar) != 0) - ivar = 0; - di->baudrate = ivar; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - return (0); - } - - return (ENXIO); + /* Check the environment. */ + return (uart_getenv(devtype, di)); } From owner-p4-projects@FreeBSD.ORG Fri Mar 19 20:47:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4789316A4D0; Fri, 19 Mar 2004 20:47:11 -0800 (PST) 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 229EC16A4CE for ; Fri, 19 Mar 2004 20:47:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B1B243D1F for ; Fri, 19 Mar 2004 20:47:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K4lAGe089207 for ; Fri, 19 Mar 2004 20:47:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K4lARX089087 for perforce@freebsd.org; Fri, 19 Mar 2004 20:47:10 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Fri, 19 Mar 2004 20:47:10 -0800 (PST) Message-Id: <200403200447.i2K4lARX089087@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 Subject: PERFORCE change 49341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 04:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=49341 Change 49341 by marcel@marcel_nfs on 2004/03/19 20:46:38 Remove wrong prototype. While here update a comment. Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#4 edit Differences ... ==== //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#4 (text+ko) ==== @@ -42,8 +42,6 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -static phandle_t uart_cpu_getdev_keyboard(phandle_t root); - static struct bus_space_tag bst_store[3]; static int @@ -104,9 +102,10 @@ /* * Get the address of the UART that's selected as the debug port. Since - * there's no place for this in the OF, we use the kernel environment. - * The environment variable is "debug_port" and its value is the device - * name (or an alias) known by the OF. + * there's no place for this in the OF, we use the kernel environment + * variable "hw.uart.dbgport". Note however that the variable is not a + * list of attributes. It's single device name or alias, as known by + * the OF. */ static phandle_t uart_cpu_getdev_dbgport(phandle_t options, char *dev, size_t devsz) From owner-p4-projects@FreeBSD.ORG Fri Mar 19 21:10:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E953116A4D0; Fri, 19 Mar 2004 21:10:40 -0800 (PST) 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 C2B5C16A4CE for ; Fri, 19 Mar 2004 21:10:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB3F943D1F for ; Fri, 19 Mar 2004 21:10:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K5AeGe095576 for ; Fri, 19 Mar 2004 21:10:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K5Ae7I095573 for perforce@freebsd.org; Fri, 19 Mar 2004 21:10:40 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 21:10:40 -0800 (PST) Message-Id: <200403200510.i2K5Ae7I095573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 05:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=49343 Change 49343 by peter@peter_overcee on 2004/03/19 21:10:34 DOH!!!!!! Fix stack alignment bugs for -static case. This might fix libpthread too. Affected files ... .. //depot/projects/hammer/lib/csu/amd64/crti.S#5 edit .. //depot/projects/hammer/lib/csu/amd64/crtn.S#5 edit Differences ... ==== //depot/projects/hammer/lib/csu/amd64/crti.S#5 (text+ko) ==== @@ -28,12 +28,14 @@ .globl _init .type _init,@function _init: + subq $8,%rsp .section .fini,"ax",@progbits .align 4 .globl _fini .type _fini,@function _fini: + subq $8,%rsp .section .rodata .ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0" ==== //depot/projects/hammer/lib/csu/amd64/crtn.S#5 (text+ko) ==== @@ -24,9 +24,11 @@ */ .section .init,"ax",@progbits + addq $8,%rsp ret .section .fini,"ax",@progbits + addq $8,%rsp ret .section .rodata From owner-p4-projects@FreeBSD.ORG Fri Mar 19 23:25:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B16916A4D0; Fri, 19 Mar 2004 23:25:35 -0800 (PST) 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 2BEB316A4CE for ; Fri, 19 Mar 2004 23:25:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CA2D43D1F for ; Fri, 19 Mar 2004 23:25:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K7PYGe026375 for ; Fri, 19 Mar 2004 23:25:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K7PY2Q026372 for perforce@freebsd.org; Fri, 19 Mar 2004 23:25:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 23:25:34 -0800 (PST) Message-Id: <200403200725.i2K7PY2Q026372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 07:25:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=49349 Change 49349 by peter@peter_overcee on 2004/03/19 23:25:14 argh! Fix up (I think) more misaligned stack problems. _rtld() was being called with an unaligned stack, which caused any _init()s in shared libs to be called unaligned. _rtld_bind() was also being called unaligned. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#12 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#12 (text+ko) ==== @@ -31,14 +31,13 @@ .type .rtld_start,@function .rtld_start: xorq %rbp,%rbp # Clear frame pointer for good form - subq $16,%rsp # A place to store exit procedure addr + subq $24,%rsp # A place to store exit procedure addr movq %rdi,%r12 movq %rsp,%rsi # save address of exit proc movq %rsp,%rdx # construct address of obj_main addq $8,%rdx call _rtld@PLT # Call rtld(sp); returns entry point popq %rsi # Get exit procedure address - addq $8,%rsp # Ignore obj_main movq %r12,%rdi # *ap /* * At this point, %rax contains the entry point of the main program, and @@ -62,8 +61,9 @@ * assembly-language code that is not ABI-compliant. * * Stack map: - * reloff 0x58 - * obj 0x50 + * reloff 0x60 + * obj 0x58 + * spare 0x50 * rflags 0x48 * rax 0x40 * rdx 0x38 @@ -90,15 +90,15 @@ pushq %r10 # Save %r10 pushq %r11 # Save %r11 - movq 0x50(%rsp),%rdi # Fetch obj argument - movq 0x58(%rsp),%rsi # Fetch reloff argument + movq 0x58(%rsp),%rdi # Fetch obj argument + movq 0x60(%rsp),%rsi # Fetch reloff argument leaq (%rsi,%rsi,2),%rsi # multiply by 3 leaq (,%rsi,8),%rsi # now 8, for 24 (sizeof Elf_Rela) call _rtld_bind@PLT # Transfer control to the binder /* Now %rax contains the entry point of the function being called. */ - movq %rax,0x58(%rsp) # Store target over reloff argument + movq %rax,0x60(%rsp) # Store target over reloff argument popq %r11 # Restore %r11 popq %r10 # Restore %r10 popq %r9 # Restore %r9 From owner-p4-projects@FreeBSD.ORG Fri Mar 19 23:29:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E942316A4D0; Fri, 19 Mar 2004 23:29:40 -0800 (PST) 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 C235716A4CE for ; Fri, 19 Mar 2004 23:29:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBBA443D2F for ; Fri, 19 Mar 2004 23:29:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K7TeGe026490 for ; Fri, 19 Mar 2004 23:29:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K7TeNU026487 for perforce@freebsd.org; Fri, 19 Mar 2004 23:29:40 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 23:29:40 -0800 (PST) Message-Id: <200403200729.i2K7TeNU026487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 07:29:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=49350 Change 49350 by peter@peter_overcee on 2004/03/19 23:29:08 argh. actually create the hole on the stack for the alignment. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#13 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#13 (text+ko) ==== @@ -79,6 +79,7 @@ .globl _rtld_bind_start .type _rtld_bind_start,@function _rtld_bind_start: + subq $8,%rsp pushfq # Save rflags pushq %rax # Save %rax pushq %rdx # Save %rdx @@ -109,5 +110,5 @@ popq %rdx # Restore %rdx popq %rax # Restore %rax popfq # Restore rflags - leaq 8(%rsp),%rsp # Discard obj, do not change rflags + leaq 16(%rsp),%rsp # Discard spare, obj, do not change rflags ret # "Return" to target address From owner-p4-projects@FreeBSD.ORG Sat Mar 20 01:00:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 402BE16A4D0; Sat, 20 Mar 2004 01:00:39 -0800 (PST) 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 19FE616A4CE for ; Sat, 20 Mar 2004 01:00:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1238543D1D for ; Sat, 20 Mar 2004 01:00:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K90cGe052898 for ; Sat, 20 Mar 2004 01:00:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K90c22052895 for perforce@freebsd.org; Sat, 20 Mar 2004 01:00:38 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 01:00:38 -0800 (PST) Message-Id: <200403200900.i2K90c22052895@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 Subject: PERFORCE change 49357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 09:00:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=49357 Change 49357 by marcel@marcel_nfs on 2004/03/20 00:59:41 IFC @49353 Affected files ... .. //depot/projects/gdb/etc/rc.d/devfs#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/gdb/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/gdb/sys/ia64/include/reg.h#2 integrate Differences ... ==== //depot/projects/gdb/etc/rc.d/devfs#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.7 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.8 2004/03/20 07:10:16 green Exp $ # # PROVIDE: devfs @@ -16,10 +16,23 @@ devfs_start() { - if [ -n "$devfs_system_ruleset" ]; then + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then devfs_init_rulesets - devfs_set_ruleset $devfs_system_ruleset /dev - devfs_apply_ruleset $devfs_system_ruleset /dev + if [ -n "$devfs_system_ruleset" ]; then + devfs_set_ruleset $devfs_system_ruleset /dev + devfs_apply_ruleset $devfs_system_ruleset /dev + fi + if [ -n "$devfs_set_rulesets" ]; then + local _dir_set + local _dir + local _set + for _dir_set in $devfs_set_rulesets; do + _dir=${_dir_set%=*} + _set=${_dir_set#*=} + devfs_set_ruleset $_set $_dir + devfs_apply_ruleset $_set $_dir + done + fi fi read_devfs_conf } ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.700 2004/03/18 17:51:55 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.703 2004/03/20 07:17:12 hrs Exp $ 2000 @@ -191,6 +191,12 @@ This is currently non-functional, and would require some amount of work to make it work under the &man.geom.4; API in 5-CURRENT. + For the &man.uart.4; device + hw.uart.console and + hw.uart.dbgport environment variables + have been added. They can be used to select a serial console and + debug port respectively, as well as the attributes. + The &man.ubser.4; device driver has been added to support BWCT console management serial adapters. @@ -321,6 +327,9 @@ support for USB Ethernet adapters based on the Davicom DM9601 chipset. + The hardware TX checksum support of the &man.xl.4; driver + has been disabled as it does not work correctly and slows down + the transmission rate. &merged; @@ -376,6 +385,9 @@ work better, and some problems with timeouts should be resolved. + The &man.ips.4; driver now supports the recent + Adaptec ServeRAID series SCSI controller cards. + The &man.umass.4; driver now supports the missing ATAPI MMC commands and handles the timeout properly. ==== //depot/projects/gdb/sys/dev/sound/pci/vibes.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.15 2004/03/06 15:52:42 matk Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.16 2004/03/20 04:38:21 marcel Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ @@ -547,6 +547,7 @@ } } DEB(printf("sv_mix_setrecsrc: mask 0x%08x adc_input 0x%02x\n", mask, v)); + sv_indirect_set(sc, SV_REG_ADC_INPUT, v); return mask; } ==== //depot/projects/gdb/sys/dev/uart/uart_subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.1 2004/03/20 02:14:02 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.2 2004/03/20 08:38:33 marcel Exp $"); #include #include @@ -177,6 +177,8 @@ else if (devtype == UART_DEV_DBGPORT) spec = getenv("hw.uart.dbgport"); else + spec = NULL; + if (spec == NULL) return (ENXIO); /* Set defaults. */ ==== //depot/projects/gdb/sys/dev/usb/usb_subr.c#4 (text+ko) ==== @@ -7,7 +7,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.61 2004/03/19 08:19:52 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.62 2004/03/20 07:31:11 julian Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1124,14 +1124,14 @@ DPRINTF(("usbd_new_device: new dev (addr %d), dev=%p, parent=%p\n", addr, dev, parent)); - usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev); - err = usbd_probe_and_attach(parent, dev, port, addr); if (err) { usbd_remove_device(dev, up); return (err); } + usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev); + return (USBD_NORMAL_COMPLETION); } ==== //depot/projects/gdb/sys/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,2 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.6 2003/11/08 23:19:13 marcel Exp $ -hint.uart.0.baud="115200" -hint.uart.0.flags="0x10" -hint.uart.0.port="0x3f8" +# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.7 2004/03/20 04:23:03 marcel Exp $ +hw.uart.console="io:0x3f8,br:115200" ==== //depot/projects/gdb/sys/ia64/include/reg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/reg.h,v 1.12 2003/05/16 21:26:41 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/reg.h,v 1.13 2004/03/20 05:27:14 marcel Exp $ */ #ifndef _MACHINE_REG_H_ @@ -44,8 +44,8 @@ }; struct dbreg { - uint64_t dbr_data[8]; - uint64_t dbr_inst[8]; + unsigned long dbr_data[8]; + unsigned long dbr_inst[8]; }; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Sat Mar 20 01:07:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF4ED16A4D1; Sat, 20 Mar 2004 01:07:49 -0800 (PST) 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 551B716A4CE for ; Sat, 20 Mar 2004 01:07:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3953F43D2F for ; Sat, 20 Mar 2004 01:07:49 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K97mGe055811 for ; Sat, 20 Mar 2004 01:07:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K97meM055808 for perforce@freebsd.org; Sat, 20 Mar 2004 01:07:48 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 01:07:48 -0800 (PST) Message-Id: <200403200907.i2K97meM055808@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 Subject: PERFORCE change 49359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 09:07:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=49359 Change 49359 by marcel@marcel_nfs on 2004/03/20 01:07:46 o Add skeletal support for alpha and sparc64. o Make the RX/TX buffer size MD. On ia64 we need 4K buffers. o In gdb_init() return -1 when there are no debug ports and return with a higher priority if RB_GDB is in effect. o In uart_dbg_probe() return -1 on failure. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/gdb/sys/alpha/alpha/gdb_machdep.c#1 add .. //depot/projects/gdb/sys/alpha/include/gdb_machdep.h#1 add .. //depot/projects/gdb/sys/conf/files.alpha#3 edit .. //depot/projects/gdb/sys/conf/files.sparc64#2 edit .. //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#5 edit .. //depot/projects/gdb/sys/dev/uart/uart_dbg.c#3 edit .. //depot/projects/gdb/sys/gdb/gdb_int.h#3 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#5 edit .. //depot/projects/gdb/sys/gdb/gdb_packet.c#3 edit .. //depot/projects/gdb/sys/i386/include/gdb_machdep.h#2 edit .. //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#2 edit .. //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#2 edit .. //depot/projects/gdb/sys/sparc64/include/gdb_machdep.h#1 add .. //depot/projects/gdb/sys/sparc64/sparc64/gdb_machdep.c#1 add Differences ... ==== //depot/projects/gdb/sys/conf/files.alpha#3 (text+ko) ==== @@ -35,7 +35,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -alpha/alpha/alpha-gdbstub.c optional gdb alpha/alpha/api_up1000.c optional api_up1000 alpha/alpha/atomic.s standard alpha/alpha/autoconf.c standard @@ -67,6 +66,7 @@ alpha/alpha/exception.s standard alpha/alpha/fp_emulate.c standard alpha/alpha/ieee_float.c standard +alpha/alpha/gdb_machdep.c optional gdb alpha/alpha/in_cksum.c optional inet alpha/alpha/interrupt.c standard alpha/alpha/locore.s standard no-obj ==== //depot/projects/gdb/sys/conf/files.sparc64#2 (text+ko) ==== @@ -78,6 +78,7 @@ sparc64/sparc64/eeprom_ebus.c optional eeprom ebus sparc64/sparc64/eeprom_fhc.c optional eeprom fhc sparc64/sparc64/eeprom_sbus.c optional eeprom sbus +sparc64/sparc64/gdb_machdep.c optional gdb sparc64/sparc64/identcpu.c standard sparc64/sparc64/in_cksum.c optional inet sparc64/sparc64/interrupt.S standard no-obj ==== //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#5 (text+ko) ==== @@ -123,7 +123,7 @@ return (-1); /* Rudimentary sanity check: the debug port cannot be the console. */ if (OF_getprop(options, "input-device", buf, sizeof(buf)) == -1) - return (-1); + return (input); if (OF_finddevice(buf) == input) return (-1); return (input); ==== //depot/projects/gdb/sys/dev/uart/uart_dbg.c#3 (text+ko) ==== @@ -55,12 +55,12 @@ { if (uart_cpu_getdev(UART_DEV_DBGPORT, &uart_dbgport)) - return (0); + return (-1); if (uart_probe(&uart_dbgport)) - return (0); + return (-1); - return (1); + return (0); } static void ==== //depot/projects/gdb/sys/gdb/gdb_int.h#3 (text+ko) ==== @@ -29,10 +29,6 @@ #ifndef _GDB_GDB_INT_H_ #define _GDB_GDB_INT_H_ -#ifndef GDB_BUFSZ -#define GDB_BUFSZ 400 -#endif - extern struct gdb_dbgport *gdb_cur; extern char *gdb_rxp; ==== //depot/projects/gdb/sys/gdb/gdb_main.c#5 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -80,7 +81,11 @@ gdb_cur->gdb_init(); printf("GDB: current port: %s\n", gdb_cur->gdb_name); } - return ((gdb_cur != NULL) ? 1 : 0); + if (gdb_cur != NULL) + cur_pri = (boothowto & RB_GDB) ? 2 : 0; + else + cur_pri = -1; + return (cur_pri); } static int ==== //depot/projects/gdb/sys/gdb/gdb_packet.c#3 (text+ko) ==== @@ -31,6 +31,8 @@ #include #include +#include + #include #include ==== //depot/projects/gdb/sys/i386/include/gdb_machdep.h#2 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ +#define GDB_BUFSZ 400 + #define GDB_REG_FP 5 #define GDB_REG_PC 8 #define GDB_REG_SP 4 ==== //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#2 (text+ko) ==== @@ -59,6 +59,9 @@ if (sizeof(*r) > bufsz) return (-1); + r->r_special = tf->tf_special; + r->r_scratch = tf->tf_scratch; + bzero(&r->r_preserved, sizeof(r->r_preserved)); return (sizeof(*r)); } ==== //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#2 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ +#define GDB_BUFSZ 4096 + #define GDB_REG_FP 328 #define GDB_REG_PC 331 #define GDB_REG_SP 12 From owner-p4-projects@FreeBSD.ORG Sat Mar 20 11:06:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6250B16A4E8; Sat, 20 Mar 2004 11:06:48 -0800 (PST) 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 9F5C616A52F for ; Sat, 20 Mar 2004 11:06:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80A1043D1D for ; Sat, 20 Mar 2004 11:06:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2KJ6lGe002112 for ; Sat, 20 Mar 2004 11:06:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2KJ6l2E002109 for perforce@freebsd.org; Sat, 20 Mar 2004 11:06:47 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 11:06:47 -0800 (PST) Message-Id: <200403201906.i2KJ6l2E002109@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 Subject: PERFORCE change 49382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 19:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=49382 Change 49382 by marcel@marcel_nfs on 2004/03/20 11:05:48 Desupport dbbe_enter(). All debugger entries happen through dbbe_trap(). That way we can deal with SMP in a single place. I think I added dbbe_enter() as a way to avoid the trap, but the backend has to construct a context (i.e. a trapframe) manually in that case. That's just stupid... Affected files ... .. //depot/projects/gdb/sys/gdb/gdb_main.c#6 edit .. //depot/projects/gdb/sys/kern/subr_kdb.c#5 edit .. //depot/projects/gdb/sys/sys/kdb.h#4 edit Differences ... ==== //depot/projects/gdb/sys/gdb/gdb_main.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ static dbbe_init_f gdb_init; static dbbe_trap_f gdb_trap; -KDB_BACKEND(gdb, gdb_init, NULL, NULL, gdb_trap); +KDB_BACKEND(gdb, gdb_init, NULL, gdb_trap); GDB_DBGPORT(null, NULL, NULL, NULL, NULL, NULL, NULL); SET_DECLARE(gdb_dbgport_set, struct gdb_dbgport); ==== //depot/projects/gdb/sys/kern/subr_kdb.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ int kdb_active = 0; struct kdb_dbbe *kdb_cur = NULL; -KDB_BACKEND(null, NULL, NULL, NULL, NULL); +KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); /* @@ -108,12 +108,7 @@ if (kdb_cur != NULL) { if (msg != NULL) printf("KDB: enter: %s\n", msg); - if (kdb_cur->dbbe_enter != NULL) { - kdb_active = 1; - kdb_cur->dbbe_enter(); - kdb_active = 0; - } else - breakpoint(); + breakpoint(); } } ==== //depot/projects/gdb/sys/sys/kdb.h#4 (text+ko) ==== @@ -31,24 +31,21 @@ struct trapframe; -typedef void dbbe_enter_f(void); typedef int dbbe_init_f(void); typedef void dbbe_trace_f(void); typedef int dbbe_trap_f(int, int, struct trapframe *); struct kdb_dbbe { const char *dbbe_name; - dbbe_enter_f *dbbe_enter; dbbe_init_f *dbbe_init; dbbe_trace_f *dbbe_trace; dbbe_trap_f *dbbe_trap; int dbbe_active; }; -#define KDB_BACKEND(name, init, trace, enter, trap) \ +#define KDB_BACKEND(name, init, trace, trap) \ static struct kdb_dbbe name##_dbbe = { \ .dbbe_name = #name, \ - .dbbe_enter = enter, \ .dbbe_init = init, \ .dbbe_trace = trace, \ .dbbe_trap = trap \ From owner-p4-projects@FreeBSD.ORG Sat Mar 20 15:33:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAB9116A4D1; Sat, 20 Mar 2004 15:33:37 -0800 (PST) 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 94E6F16A4CE for ; Sat, 20 Mar 2004 15:33:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E46843D3F for ; Sat, 20 Mar 2004 15:33:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2KNXbGe069100 for ; Sat, 20 Mar 2004 15:33:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2KNXaAd069097 for perforce@freebsd.org; Sat, 20 Mar 2004 15:33:36 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 15:33:36 -0800 (PST) Message-Id: <200403202333.i2KNXaAd069097@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 Subject: PERFORCE change 49408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 23:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=49408 Change 49408 by marcel@marcel_nfs on 2004/03/20 15:33:06 Turn the debugger into a critical section and stop any other CPU in SMP configurations. Affected files ... .. //depot/projects/gdb/sys/kern/subr_kdb.c#6 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_kdb.c#6 (text+ko) ==== @@ -31,6 +31,8 @@ #include #include #include +#include +#include int kdb_active = 0; struct kdb_dbbe *kdb_cur = NULL; @@ -156,11 +158,24 @@ { int handled; - if (kdb_cur != NULL && kdb_cur->dbbe_trap != NULL) { - kdb_active = 1; - handled = kdb_cur->dbbe_trap(type, code, tf); - kdb_active = 0; - } else - handled = 0; + if (kdb_cur == NULL || kdb_cur->dbbe_trap == NULL) + return (0); + + critical_enter(); + +#ifdef SMP + stop_cpus(PCPU_GET(other_cpus)); +#endif + + kdb_active++; + handled = kdb_cur->dbbe_trap(type, code, tf); + kdb_active--; + +#ifdef SMP + restart_cpus(stopped_cpus); +#endif + + critical_exit(); + return (handled); } From owner-p4-projects@FreeBSD.ORG Sat Mar 20 15:38:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53CAC16A4D0; Sat, 20 Mar 2004 15:38:45 -0800 (PST) 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 0F95916A4CF for ; Sat, 20 Mar 2004 15:38:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0414543D31 for ; Sat, 20 Mar 2004 15:38:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2KNciGe069282 for ; Sat, 20 Mar 2004 15:38:44 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2KNchPt069279 for perforce@freebsd.org; Sat, 20 Mar 2004 15:38:43 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 15:38:43 -0800 (PST) Message-Id: <200403202338.i2KNchPt069279@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 Subject: PERFORCE change 49409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 23:38:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=49409 Change 49409 by marcel@marcel_nfs on 2004/03/20 15:38:34 IFC @49406 Affected files ... .. //depot/projects/gdb/etc/ftpusers#2 integrate .. //depot/projects/gdb/etc/mail/aliases#2 integrate .. //depot/projects/gdb/include/stdio.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/gdb/share/examples/pppd/ppp.deny.sample#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/acpi_toshiba.4#2 integrate .. //depot/projects/gdb/share/termcap/termcap.src#5 integrate .. //depot/projects/gdb/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/alpha/include/_types.h#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/amd64/include/_types.h#2 integrate .. //depot/projects/gdb/sys/arm/include/_types.h#2 integrate .. //depot/projects/gdb/sys/conf/files.alpha#4 integrate .. //depot/projects/gdb/sys/conf/files.amd64#5 integrate .. //depot/projects/gdb/sys/conf/files.ia64#4 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#3 integrate .. //depot/projects/gdb/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/gdb/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/gdb/sys/dev/awi/awi.c#3 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/gdb/sys/dev/iir/iir.h#4 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/gdb/sys/i386/include/_types.h#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/uio_machdep.c#1 branch .. //depot/projects/gdb/sys/ia64/include/_types.h#2 integrate .. //depot/projects/gdb/sys/modules/uart/Makefile#3 integrate .. //depot/projects/gdb/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/gdb/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/gdb/sys/sys/types.h#2 integrate .. //depot/projects/gdb/sys/sys/uio.h#3 integrate Differences ... ==== //depot/projects/gdb/etc/ftpusers#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.12 2004/03/20 19:13:06 maxim Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -14,6 +14,7 @@ man sshd bind +proxy uucp pop www ==== //depot/projects/gdb/etc/mail/aliases#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.19 2004/03/20 19:13:06 maxim Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -34,6 +34,7 @@ nobody: root operator: root pop: root +proxy: root smmsp: postmaster sshd: root system: root ==== //depot/projects/gdb/include/stdio.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.53 2004/03/17 01:43:07 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.54 2004/03/20 11:45:52 tjr Exp $ */ #ifndef _STDIO_H_ @@ -418,16 +418,16 @@ extern int __isthreaded; -#define feof(p) (!__isthreaded ? __sfeof(p) : feof(p)) -#define ferror(p) (!__isthreaded ? __sferror(p) : ferror(p)) -#define clearerr(p) (!__isthreaded ? __sclearerr(p) : clearerr(p)) +#define feof(p) (!__isthreaded ? __sfeof(p) : (feof)(p)) +#define ferror(p) (!__isthreaded ? __sferror(p) : (ferror)(p)) +#define clearerr(p) (!__isthreaded ? __sclearerr(p) : (clearerr)(p)) #if __POSIX_VISIBLE -#define fileno(p) (!__isthreaded ? __sfileno(p) : fileno(p)) +#define fileno(p) (!__isthreaded ? __sfileno(p) : (fileno)(p)) #endif -#define getc(fp) (!__isthreaded ? __sgetc(fp) : getc(fp)) -#define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : putc(x, fp)) +#define getc(fp) (!__isthreaded ? __sgetc(fp) : (getc)(fp)) +#define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : (putc)(x, fp)) #define getchar() getc(stdin) #define putchar(x) putc(x, stdout) ==== //depot/projects/gdb/lib/libarchive/archive_platform.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/lib/libarchive/archive_platform.h,v 1.2 2004/03/19 22:37:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.3 2004/03/20 22:35:33 kientzle Exp $ */ /* @@ -49,6 +49,7 @@ #define HAVE_CHFLAGS 1 #define HAVE_LUTIMES 1 #define HAVE_LCHMOD 1 +#define HAVE_POSIX_STRERROR_R 1 #define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE #define ARCHIVE_ERRNO_PROGRAMMER EINVAL #define ARCHIVE_ERRNO_MISC (-1) @@ -85,6 +86,7 @@ #define st_atimespec st_atim #define st_mtimespec st_mtim #define st_ctimespec st_ctim +#define HAVE_GLIBC_STRERROR_R 1 #endif /* ==== //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.4 2004/03/19 22:37:06 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.5 2004/03/20 22:35:33 kientzle Exp $"); #include #ifdef HAVE_DMALLOC @@ -81,9 +81,7 @@ int header_recursion_depth; }; -static size_t UTF8_mbrtowc(wchar_t * __restrict pwc, - const char * __restrict s, size_t n, - mbstate_t * __restrict ps __unused); +static size_t UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n); static int archive_block_is_null(const unsigned char *p); static int header_Solaris_ACL(struct archive *, struct tar *, struct archive_entry *, struct stat *, const void *); @@ -640,8 +638,9 @@ header_pax_extensions(struct archive *a, struct tar *tar, struct archive_entry *entry, struct stat *st, const void *h) { + int err, err2; + read_body_to_string(a, &(tar->pax_header), h); - int err, err2; /* Parse the next header. */ err = tar_read_header(a, tar, entry, st); @@ -1085,7 +1084,7 @@ err = 0; while(length > 0) { - n = UTF8_mbrtowc(dest, src, length, NULL); + n = UTF8_mbrtowc(dest, src, length); if (n == 0) break; if (n > 8) { @@ -1106,8 +1105,7 @@ * Copied from FreeBSD libc/locale. */ static size_t -UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, - mbstate_t * __restrict ps __unused) +UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n) { int ch, i, len, mask; wchar_t lbound, wch; ==== //depot/projects/gdb/lib/libarchive/archive_util.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.3 2004/03/20 22:35:33 kientzle Exp $"); #include @@ -84,6 +84,7 @@ { va_list ap; char errbuff[512]; + char *errp; a->archive_error_number = error_number; if (fmt == NULL) { @@ -95,8 +96,16 @@ archive_string_vsprintf(&(a->error_string), fmt, ap); if(error_number > 0) { archive_strcat(&(a->error_string), ": "); +#if defined(HAVE_GLIBC_STRERROR_R) + errp = strerror_r(error_number, errbuff, sizeof(errbuff)); +#elif defined(HAVE_POSIX_STRERROR_R) strerror_r(error_number, errbuff, sizeof(errbuff)); - archive_strcat(&(a->error_string), errbuff); + errp = errbuff; +#else + /* Note: this is not threadsafe! */ + errp = strerror(error_number); +#endif + archive_strcat(&(a->error_string), errp); } a->error = a->error_string.s; va_end(ap); ==== //depot/projects/gdb/lib/libc/stdio/fseek.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fseek.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.24 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.25 2004/03/20 08:38:27 tjr Exp $ .\" -.Dd October 12, 2002 +.Dd March 19, 2004 .Dt FSEEK 3 .Os .Sh NAME @@ -149,21 +149,29 @@ and .Fn fsetpos functions -are alternate interfaces equivalent to +are alternate interfaces for retrieving and setting the current position in +the file, similar to .Fn ftell and -.Fn fseek -(with whence set to -.Dv SEEK_SET ) , -setting and storing the current value of -the file offset into or from the object referenced by +.Fn fseek , +except that the current position is stored in an opaque object of +type +.Vt fpos_t +pointed to by .Fa pos . -On some -.Pq non- Ns Tn UNIX -systems an -.Dq Fa fpos_t -object may be a complex object -and these routines may be the only way to portably reposition a text stream. +These functions provide a portable way to seek to offsets larger than +those that can be represented by a +.Vt long int . +They may also store additional state information in the +.Vt fpos_t +object to facilitate seeking within files containing multibyte +characters with state-dependent encodings. +Although +.Vt fpos_t +has traditionally been an integral type, +applications cannot assume that it is; +in particular, they must not perform arithmetic on objects +of this type. .Pp If the stream is a wide character stream (see .Xr fwide 3 ) , ==== //depot/projects/gdb/lib/libc/stdio/funopen.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)funopen.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/stdio/funopen.3,v 1.13 2003/09/08 19:57:15 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/funopen.3,v 1.14 2004/03/20 08:41:12 tjr Exp $ .\" -.Dd June 9, 1993 +.Dd March 19, 2004 .Dt FUNOPEN 3 .Os .Sh NAME @@ -170,3 +170,11 @@ function may not be portable to systems other than .Bx . +.Pp +The +.Fn funopen +interface erroneously assumes that +.Vt fpos_t +is an integral type; see +.Xr fseek 3 +for a discussion of this issue. ==== //depot/projects/gdb/share/examples/pppd/ppp.deny.sample#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.10 2003/04/28 08:36:45 maxim Exp $ +# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.11 2004/03/20 19:13:06 maxim Exp $ # # list of users disallowed any pppd access via 'system # password login'. @@ -17,6 +17,7 @@ smmsp mailnull bind +proxy ftp uucp pop ==== //depot/projects/gdb/share/man/man4/man4.i386/acpi_toshiba.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_toshiba.4,v 1.2 2004/02/20 16:05:38 ru Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_toshiba.4,v 1.4 2004/03/20 13:05:11 marks Exp $ .\" .Dd February 19, 2004 .Dt ACPI_TOSHIBA 4 i386 @@ -73,7 +73,7 @@ This provides functionality similar to the .Va hw.acpi.cpu.throttle_state variable. -Note, however, that higher values mean higher speeds here. +Higher sysctl values mean lower CPU speeds. .El .Pp Defaults for these variables can be set in ==== //depot/projects/gdb/share/termcap/termcap.src#5 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.142 2004/03/16 18:04:14 schweikh Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.143 2004/03/20 13:11:59 schweikh Exp $ # Termcap source file # John Kunze, Berkeley @@ -401,7 +401,7 @@ :ce=\EI:cm=\EY%+\040%+\040:nd=\EC:up=\EA:do=\EB:\ :dl=\EO:dc=\EQ:kd=\EB:ku=\EA:kl=\ED:kr=\EC:kh=\EH:\ :us=\E4\102:ue=\E4\100:so=\E4\110:se=\E4\100: -#From seth@sirius.ctr.columbia.edu Sun May 20 11:02:34 1990 +# From seth@sirius.ctr.columbia.edu Sun May 20 11:02:34 1990 ibm3163|ibm63|i3163|3163|IBM 3163:\ :al=\EN:am:bs:bt=\E2:cd=\EJ:ce=\EI:cl=\EL:\ :cm=\EY%+\040%+\040:co#80:ct=\E 1:dc=\EQ:\ @@ -441,8 +441,8 @@ :ts=\Ej\EY8%+ \Eo:fs=\Ek:ds=\Ej\EY8\40\EI\Ek:es:hs:sb:tc=ibm3101: ibmega-c|ibm5154-c|IBM Enhanced Color Display color termcap:\ :se=\EB:so=\EF\Ef3;:ue=\EB:us=\EF\Ef2;:tc=ibmconsole: -#from marc pawliger--marc@ibminet.awdpa.ibm.com -#also in /usr/lpp/bos/bsdsysadmin. +# from marc pawliger--marc@ibminet.awdpa.ibm.com +# also in /usr/lpp/bos/bsdsysadmin. hft-c|ibm8512|ibm8513|IBM High Function Terminal:\ :co#80:li#25:am:ht:\ :cm=\E[%i%d;%dH:ti=\E[20;4l\E[?7h\Eb:te=\E[20h:\ @@ -472,13 +472,40 @@ :k1=\E[001q:k2=\E[002q:k3=\E[003q:k4=\E[004q:\ :k5=\E[005q:k6=\E[006q:k7=\E[007q:k8=\E[008q:\ :k9=\E[009q:ka=\E[010q: -#From pryor@math.berkeley.edu +# From pryor@math.berkeley.edu ibm5081|ibmmpel|IBM 5081 1024x1024 256/4096 color display:\ :ts=\Ej\EYA%+ \Eo:fs=\Ek:ds=\Ej\EYA\40\EI\Ek:es:hs:\ :li#33:tc=ibmconsole: ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 enhanced color display:\ :ts=\Ej\EYA%+ \Eo:fs=\Ek:ds=\Ej\EYA\40\EI\Ek:es:hs:\ :li#33:tc=ibmega-c: +# ibm3151 and ibm3151-25 are modified from a Usenet posting +# from http://www.cs.utk.edu/~shuford/terminal/ibm_3161.termcap.txt +# Newsgroups: comp.terminals Message-ID: <1rkqgnINNdso@uwm.edu> +ibm3151|ibm3152|ibm3162|Ibm3162|ibm3151-pc:\ + :am:mi:ms:\ + :co#80:li#24:kn#9:\ + :cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EY%+ %+ :dc=\EQ:dl=\EO:\ + :ho=\EH:k1=\Ea\n:k2=\Eb\n:k3=\Ec\n:k4=\Ed\n:k5=\Ee\n:\ + :k6=\Ef\n:k7=\Eg\n:k8=\Eh\n:k9=\Ei\n:kb=\b:kd=\EB:\ + :kh=\EH:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\E4>b:so=\E4!a:\ + :te=\E>A:ti=\E>B:ue=\E4=b:up=\EA:us=\E4"a:bc=\ED:\ + :U8=\Eb:so=\E4!a:\ + :te=\E>A:ti=\E>B:ue=\E4=b:up=\EA:us=\E4"a:bc=\ED:\ + :U8=\E, basic ln03 entries +# From William King , basic ln03 entries ln03|dec ln03 LaserPrinter:\ :co#80:li#66:hc:hu=\EL:hd=\EK:so=\E[1m:se=\E[22m:\ :us=\E[4m:ue=\E[24m: @@ -2630,29 +2657,29 @@ # (acsc removed to fit entry within 1023 bytes) # (terminfo-only capabilities suppressed to fit entry within 1023 bytes) vt420|vt420-24|dec-vt420|DEC vt420 7 bit controls 80x24 autowrap:\ - :am:es:hs:mi:ms:xn:xo:\ - :co#80:it#8:li#24:ws#80:\ - :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ - :LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\ - :cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\ - :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\ - :ds=\E[2$~\r\E[1$}\E[K\E[$}:ec=\E[%dX:ei=\E[4l:fs=\E[$}:\ - :ho=\E[H:ic=\E[@:im=\E[4h:is=\E[?7h\E[>\E[?1h\E F\E[?4l:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\ - :k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\ - :kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\ - :md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\ - :se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ - :ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\ - :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h: + :am:es:hs:mi:ms:xn:xo:\ + :co#80:it#8:li#24:ws#80:\ + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ + :LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\ + :cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\ + :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\ + :ds=\E[2$~\r\E[1$}\E[K\E[$}:ec=\E[%dX:ei=\E[4l:fs=\E[$}:\ + :ho=\E[H:ic=\E[@:im=\E[4h:is=\E[?7h\E[>\E[?1h\E F\E[?4l:\ + :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\ + :k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\ + :kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\ + :md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\ + :se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:us=\E[4m:\ + :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h: vt400|dec-vt400|DEC VT400 level terminal for telnet alias:\ - :tc=vt420: + :tc=vt420: vt420-w|DEC vt420 7 bit controls 132x24 autowrap:\ - :co#132:tc=vt420: + :co#132:tc=vt420: vt420-36|DEC vt420 7 bit controls 80x36 autowrap:\ - :li#36:tc=vt420: + :li#36:tc=vt420: vt420-36w|DEC vt420 7 bit controls 132x36 autowrap:\ - :co#132:li#36:tc=vt420: + :co#132:li#36:tc=vt420: # From ftp://gatekeeper.dec.com/pub/DEC/termcaps/ : # @@ -2681,17 +2708,17 @@ :cl=50\E[;H\E[2J:cm=10\E[%i%d;%dH:cs=\E[%i%d;%dr:\ :dc=\E[P:dl=\E[M:ei=\E[4l:ho=\E[H:\ :if=/usr/lib/tabset/vt100:\ - :im=\E[4h:\ + :im=\E[4h:\ :is=\E[1;24r\E[24;1H:\ :r3=\E[?67h\E[64;1"p:\ :i3=\E[?67h\E[64;1"p:\ :k0=\E[29~:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ - :k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\ - :kb=\b:kd=\E[B:ke=\E>:kl=\E[D:\ + :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ + :k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\ + :kb=\b:kd=\E[B:ke=\E>:kl=\E[D:\ :kr=\E[C:ks=\E=:ku=\E[A:nd=\E[C:\ :rc=\E8:rf=/usr/lib/tabset/vt100:\ - :se=\E[m:so=\E[7m:\ + :se=\E[m:so=\E[7m:\ :sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:nl=\E[B:ko=do,nd,up: # vt520nam|vt520-nam|v520n|DEC VT520 with no automargins:\ @@ -2813,7 +2840,7 @@ # Alternate terminal description that "works" for interactive shells such as # tcsh and bash. xterm-noapp|xterm with cursor keys in normal mode:\ - kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:ks=\E=:ke=\E>:ti@:te@:tc=xterm: + :kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:ks=\E=:ke=\E>:ti@:te@:tc=xterm: # # These aliases are for compatibility with the terminfo; termcap cannot provide # the extra features, but termcap applications still want the names. @@ -2930,14 +2957,14 @@ :am:km:mi:ms:xn:\ :co#80:li#24:Co#8:it#8:lm#0:pa#8:\ :AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:\ - :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\ + :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\ :bl=^G:cr=\r:ta=\t:\ :cl=\E[H\E[J:cb=\E[1K:ce=\E[K:cd=\E[J:\ :cm=\E[%i%d;%dH:ho=\E[H:\ :LE=\E[%dD:le=\b:\ :DO=\E[%dB:do=\n:\ :RI=\E[%dC:nd=\E[C:\ - :UP=\E[%dA:up=\E[A:\ + :UP=\E[%dA:up=\E[A:\ :DC=\E[%dP:dc=\E[P:DL=\E[%dM:dl=\E[M:\ :IC=\E[%d@:ic=\E[@:AL=\E[%dL:al=\E[L:\ :sc=\E7:rc=\E8:\ @@ -3056,8 +3083,8 @@ :ml=\El:MT:mu=\Em:km:\ :mh=\E&dH:mr=\E&dB:us=\E&dD:mb=\E&dA:me=\E&d@:\ :ku=\EA:kd=\EB:kl=\ED:kr=\EC:kh=\Eh:ks=\E&s1A:ke=\E&s0A:tc=hp: -#HP 236 console -#from ddavis@ic.berkeley.edu +# HP 236 console +# from ddavis@ic.berkeley.edu 236|hp236|HP236 internal terminal emulator:\ :am:bs:li#24:co#80:ce=\EK:cl=\EF:cm=\EE%+ %+ :\ :dc=\EJ:dl=\EH:ic=\EI:al=\EG:up=^K:\ @@ -3080,7 +3107,7 @@ :se=\E&d@:ue=\E&d@:im=\EQ:so=\E&dB:us=\E&dD:me=\E&d@:ei=\ER:\ :if=/usr/share/tabset/stdcrt:al=\EL:kb=\b:kd=\EB:kh=\Eh:kl=\ED:\ :kr=\EC:ku=\EA:ke=\E&s0A:ks=\E&s1A:sf=\n:ta=\t: -#From gregc@ernie.berkeley.edu (Greg Couch) +# From gregc@ernie.berkeley.edu (Greg Couch) 9837|hp9837|98720|hp98720|98721|hp98721|HP 9000/300 workstations:\ :bs:pt:am:xs:da:db:mi:\ :co#128:li#46:lm#0:\ @@ -3149,8 +3176,8 @@ :sr=\EM:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[0m\E[11m\E[?7h: h19-bs|h19bs|heathkit w/keypad shifted:\ :ks=\Et:ke=\Eu:tc=h19-b: -#written by David Shewmake, UCSF Medical Information Science -#ucbvax!ucsfmis!shewmake +# written by David Shewmake, UCSF Medical Information Science +# ucbvax!ucsfmis!shewmake h29|heath-29|z29|zenith-29:\ :am:bc=\ED:bt=\E-:do=^J:\ :al=\EL:le=^H:bs:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :co#80:dc=\EN:\ @@ -3159,7 +3186,7 @@ :kb=^H:ku=\EA:kd=\EB:kl=\ED:kr=\EC:kh=\EH:kn#1:k0=\E~:l0=HOME:\ :k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\E0I:\ :es:hs:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:fs=\Ek\Ey5:ds=\Ey1:us=\Es8:ue=\Es0: -#the z29-e entry sucks...but it works with emacs +# the z29-e entry sucks...but it works with emacs z29-e|zenith 29 hacked for emacs:\ :ip=1.5:ks=\Et:ke=\Eu:vs@:ve@:al=1*\EL:am:le=^H:\ :bs:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :co#80:dc=\EN:dl=1*\EM:\ @@ -3195,7 +3222,7 @@ z29a-nkc-uc|h29a-nkc-uc:\ :rs=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m\E[11m:\ :tc=z29a: -#z100 entry from Brad Brahms at TRW (Brahms@USC-ECLC) +# z100 entry from Brad Brahms at TRW (Brahms@USC-ECLC) # usenet: {decvax,ucbvax}!trwrb!trwspp!brahms z100|h100|z110|z-100|h-100|heath/zenith z-100 pc with color monitor:\ :vs=\Ex4\Em71:ve=\Ey4\Em70:tc=z100bw: @@ -3284,7 +3311,7 @@ :ko=ho:l1=F1:l2=F2:l3=F3:l4=F4:l5=F5:l6=F6:l7=F7:\ :kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:li#24:\ :ma=j^Jk^P^K^Pl ^R^L^L :nd=^L:se=\E(:so=\E):ta=\Ei:up=^K: -#From: stephen%comp.lancs.ac.uk@ucl-cs.arpa +# From: stephen%comp.lancs.ac.uk@ucl-cs.arpa adm11|lsi adm11:\ :do=^J:bs:\ :cd=\EY:ce=\ET:kb=^H:kh=^^:\ @@ -3440,8 +3467,8 @@ :do=^J:le=^H:bs:co#132:hc:os: # From lesleymw@topaz.berkeley.edu ti931|ti 931:\ - al=\EN:am:bs:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :co#80:dl=\EO:do=\EB:\ - eo:ho=\EH:li#24:ku=\EA:kd=\EB:kr=\EC:kl=\ED:mi:nd:sf=\Eb:sr=\Ea:up=\EA: + :al=\EN:am:bs:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :co#80:dl=\EO:do=\EB:\ + :eo:ho=\EH:li#24:ku=\EA:kd=\EB:kr=\EC:kl=\ED:mi:nd:sf=\Eb:sr=\Ea:up=\EA: # # -------------------------------- # # v: TELEVIDEO @@ -3654,7 +3681,7 @@ ims950-rv|ims tvi950 rev video:\ :k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:kl@:ko@:kr@:ku@:\ :vb@:xn@:tc=tvi950-rv: -#From Andreas Stolcke +# From Andreas Stolcke tvi955|955|televideo955:\ :ct=\E3:st=\E1:do=^J:\ :rs=\EDF\EC\Eg\Er\EO\E\047\E(\Ew\EX\Ee ^O\ @@ -3702,30 +3729,30 @@ # # Advice on the Wyse 30 and 50 standout mode glitch: # (from steve@omni.com or ...pyramid!koosh!steve) -# +# # These terminals support a "PROTECT" sequence on/off that has no # standout-glitch (xmc), while the regular "attribute" stuff enabled # with G'some-character' gives a 1-space glitch. -# +# # All but the very old revision firmware on both terminals support a # visible PROTECT attribute that's selectable by the ol' SETUP menu. # (The older rev. terminals do support PROTECT attribute but only # have the options REGULAR and DIM) -# +# # Get into your terminal's SETUP menu, and down-key to the 5'th # menu (on a wyse 30; I think 3'rd or 4'th on a wyse 50) and # right-key over to the PROTECT item. -# +# # Change PROTECT to REVERSE or REVERSE/DIM, and go over to the next # item -- ATTRIBUTE and change it to LINE; then save the changes for # power-on. (ATTRIBUTE change isn't necessary but looks a whole lot # nicer to the eye when inverting the remainder of a line rather then # the rest of the screen!). -# +# # The next thing to do is change your /usr/lib/something?/terminfo/w/wyse50 # so that it uses the proper escape sequences to turn on/off the protect # sequence rather than the very-ugly \EG4 and \EG0. -# +# # Change standout to \E), standend to \E(, and glitch to 0, which means # changing the so, se, and sg fields to :so=\E):se=\E(:sg#0: # @@ -4037,7 +4064,7 @@ :nl=^_:al=^D:am:bs:cd=^B:ce=^A:cl=^L:cm=\EY%+ %+ :co#80:\ :dl=^K:do=^_:ho=^F:li#24:nd=^]:ms:pt:se=^O:so=^N:up=^^:\ :kb=^H:kd=^_:kl=^\:kr=^]:ku=^^: -#From: ksb@mentor.cc.purdue.edu (Kevin Braunsdorf) +# From: ksb@mentor.cc.purdue.edu (Kevin Braunsdorf) trs16|trs-80 model 16 console:\ :al=\EL:am:bs:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :co#80:dc=\EQ:dl=\EM:\ :do=\EB:ic=\EP:ho=\EH:kb=^H:kd=\EB:kl=\ED:kn#2:kr=\EC:\ @@ -4048,7 +4075,7 @@ :BN=\E[?33h:BF=\E[?33l:UC=\E[_\040q:BC=\E[\177\040q:\ :PN=\E]=:PS=\E]+:\ :CN=\ERC:CF=\ERc:NR=\ERD:NM=\ER@: -#From {pbrown,ctl}@ocf.berkeley.edu, 12 Mar 90 +# From {pbrown,ctl}@ocf.berkeley.edu, 12 Mar 90 coco3|os9LII|Tandy CoCo3 24*80 OS9 Level II:\ :am:bs:cl=5*^L:li#24:co#80:ho=^A:\ :cd=^K:ce=^D:cm=2%r^B%+ %+ :\ @@ -4106,7 +4133,7 @@ :is=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9\EF:\ :im=\EZ:sg@:ug@:vb=\200\200\200^G\200\200\200:\ :mh=\E):mr=\Ej:me=\E(\Ek:tc=abm85: -#from malman@bbn-vax.arpa +# from malman@bbn-vax.arpa kt7|kimtron model kt-7:\ :am:bs:co#80:li#24:cm=\E=%+ %+ :cl=^Z:cd=\EY:ce=\ET:is=\El\E":\ :al=\EE:dl=\ER:ic=\EQ:dc=\EW:if=/usr/share/tabset/stdcrt:\ @@ -4256,7 +4283,7 @@ go140w|graphon go-140 in 132 column mode:\ :co#132:is=\E<\E=\E[?3h\E[?7h\E(B\E[J\E7\E[;r\E8\E[m\E[q:\ :tc=go140: -#From edm@nwnexus.WA.COM. Hacked up vt200 termcap to handle GO-225/VT220 +# From edm@nwnexus.WA.COM. Hacked up vt200 termcap to handle GO-225/VT220 go225|go-225|Graphon 225:\ :im=\E[4h:ei=\E[4l:mi:dc=\E[P:al=\E[L:dl=\E[M:\ :cs=\E[%i%d;%dr:sf=\ED:sr=\EM:\ @@ -4272,7 +4299,7 @@ sanyo55|sanyo|sanyo mbc-55x pc compatible:\ :co#80:li#25:am:cl=\E[H\E[J:bs:cm=\E[%i%d;%dH:nd=\E[C:up=\E[A:\ :ce=\E[K:cd=\E[J:so=\E[7m:se=\E[m:us=\E[4m:ue=\E[m: -#From: Simson L. Garfinkel +# From: Simson L. Garfinkel ST|atari st:\ :bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#80:li#25:nd=\EC:\ :pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:\ @@ -4373,7 +4400,7 @@ # something like a Dnet Fterm with the window sized to some peculiar # dimension larger than 80 columns. # :k0=\E9~ map F10 to k0 - could have F0-9 -> k0-9, but ... F10 was 'k;' -# :F1-FA removed F11 through F20. +# :F1-FA removed F11 through F20. amiga|Amiga ANSI:\ :co#80:li#24:am:bs:bw:\ :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\ @@ -4396,7 +4423,7 @@ # From Joel Rubin, jmrubin@coral, a preliminary TERMCAP for VIDTEX, # a terminal program sold by Compuserve. Line and column numbers are # computer-dependent (I have a Commodore '64); you should use the meta-B -# option to shut off clean-breaking of lines. No key codes included +# option to shut off clean-breaking of lines. No key codes included # since some of them are programmable and most are machine-specific. # Works on vi if you don't use clean-breaking. Very similar to the IBM 3101 # termcap. Escape-D used for backspace because control-H is destructive @@ -4446,7 +4473,7 @@ :am:bs:cd=\E/:ce=\EQ:cl=\EZ:cm=\EY%r%+ %+ :co#80:dc=\E\\:\ :do=^J:ic=\E[:li#24:nd=\EC:so=\EJ:se=\EK:up=\EA:\ :sr=\En:ho=\EH: -# From Christian Weisgerber, naddy@mips.inka.de, a TERMCAP entry +# From Christian Weisgerber, naddy@mips.inka.de, a TERMCAP entry # for Linux consoles. linux|Linux Console:\ :am:eo:mi:ms:xn:xo:\ @@ -4514,25 +4541,25 @@ # Termcap entry for Eterm, taken from the sources of Eterm-0.9.2 Eterm|Eterm Terminal Emulator (X11 Window System):\ - :am:bw:eo:km:mi:ms:xn:xo:\ - :co#80:it#8:li#24:lm#0:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39m\E[49m:\ - :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ - :K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\ - :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\ - :ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\ - :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\ - :ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E>\E[?1l:ic=\E[@:\ - :im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ - :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ - :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\ - :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\ - :kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\ - :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\ - :sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ - :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\ - :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\ - :ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~: + :am:bw:eo:km:mi:ms:xn:xo:\ + :co#80:it#8:li#24:lm#0:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39m\E[49m:\ + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ + :K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\ + :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\ + :ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\ + :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\ + :ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E>\E[?1l:ic=\E[@:\ + :im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ + :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ + :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\ + :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\ + :kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\ + :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\ + :sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\ + :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\ + :ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~: # # END OF TERMCAP -# ------------------------ +# ------------------------ ==== //depot/projects/gdb/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; ==== //depot/projects/gdb/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef double __float_t; ==== //depot/projects/gdb/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -63,6 +63,7 @@ * Standard type definitions. */ typedef __uint32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int32_t __critical_t; typedef __int32_t __intfptr_t; typedef __int64_t __intmax_t; ==== //depot/projects/gdb/sys/conf/files.alpha#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.108 2004/01/13 18:05:49 des Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.109 2004/03/20 21:06:20 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -82,6 +82,7 @@ alpha/alpha/swtch.s standard alpha/alpha/sys_machdep.c standard alpha/alpha/trap.c standard +alpha/alpha/uio_machdep.c standard alpha/alpha/vm_machdep.c standard alpha/isa/isa.c optional isa alpha/isa/isa_dma.c optional isa ==== //depot/projects/gdb/sys/conf/files.amd64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.29 2004/03/03 09:37:44 obrien Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.30 2004/03/20 19:36:29 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,6 +75,7 @@ amd64/amd64/sys_machdep.c standard amd64/amd64/trap.c standard amd64/amd64/tsc.c standard +amd64/amd64/uio_machdep.c standard amd64/amd64/uma_machdep.c standard amd64/amd64/vm_machdep.c standard amd64/isa/atpic.c optional atpic isa ==== //depot/projects/gdb/sys/conf/files.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.64 2004/01/13 15:37:23 des Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.65 2004/03/20 21:06:20 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -123,6 +123,7 @@ ia64/ia64/sys_machdep.c standard ia64/ia64/syscall.S standard ia64/ia64/trap.c standard +ia64/ia64/uio_machdep.c standard ia64/ia64/uma_machdep.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ==== //depot/projects/gdb/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.62 2004/02/13 13:21:41 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.63 2004/03/20 22:47:30 marcel Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -165,8 +165,9 @@ rm -f tags1 sed -e 's, ../, ,' tags > tags1 -kernel-install: +.if ${MACHINE_ARCH} != "ia64" .if exists(${DESTDIR}/boot) +kernel-install-check: @if [ ! -f ${DESTDIR}/boot/device.hints ] ; then \ echo "You must set up a ${DESTDIR}/boot/device.hints file first." ; \ exit 1 ; \ @@ -175,7 +176,12 @@ echo "You must activate /boot/device.hints in loader.conf." ; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 20 17:31:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6470216A4CE; Sat, 20 Mar 2004 17:31:09 -0800 (PST) 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 3B0B616A4CE for ; Sat, 20 Mar 2004 17:31:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FF6543D39 for ; Sat, 20 Mar 2004 17:31:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L1V9Ge000880 for ; Sat, 20 Mar 2004 17:31:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L1V8wQ000867 for perforce@freebsd.org; Sat, 20 Mar 2004 17:31:08 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 20 Mar 2004 17:31:08 -0800 (PST) Message-Id: <200403210131.i2L1V8wQ000867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 01:31:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=49419 Change 49419 by peter@peter_overcee on 2004/03/20 17:30:37 IFC @49416 Affected files ... .. //depot/projects/hammer/contrib/sort/Makefile#2 delete .. //depot/projects/hammer/contrib/sort/append.c#2 delete .. //depot/projects/hammer/contrib/sort/extern.h#2 delete .. //depot/projects/hammer/contrib/sort/fields.c#2 delete .. //depot/projects/hammer/contrib/sort/files.c#2 delete .. //depot/projects/hammer/contrib/sort/fsort.c#2 delete .. //depot/projects/hammer/contrib/sort/fsort.h#2 delete .. //depot/projects/hammer/contrib/sort/init.c#2 delete .. //depot/projects/hammer/contrib/sort/msort.c#2 delete .. //depot/projects/hammer/contrib/sort/pathnames.h#2 delete .. //depot/projects/hammer/contrib/sort/regress/Makefile#2 delete .. //depot/projects/hammer/contrib/sort/regress/stests#2 delete .. //depot/projects/hammer/contrib/sort/sort.1#2 delete .. //depot/projects/hammer/contrib/sort/sort.c#2 delete .. //depot/projects/hammer/contrib/sort/sort.h#2 delete .. //depot/projects/hammer/contrib/sort/tmp.c#2 delete .. //depot/projects/hammer/etc/ftpusers#3 integrate .. //depot/projects/hammer/etc/mail/aliases#5 integrate .. //depot/projects/hammer/etc/rc.d/devfs#8 integrate .. //depot/projects/hammer/include/stdio.h#7 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#3 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_gnutar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/funopen.3#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/debug.h#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#12 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#18 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#5 integrate .. //depot/projects/hammer/share/examples/pppd/ppp.deny.sample#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_toshiba.4#2 integrate .. //depot/projects/hammer/share/termcap/termcap.src#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/alpha/include/_types.h#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/include/_types.h#8 integrate .. //depot/projects/hammer/sys/arm/include/_types.h#3 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/hammer/sys/conf/files#51 integrate .. //depot/projects/hammer/sys/conf/files.alpha#12 integrate .. //depot/projects/hammer/sys/conf/files.amd64#40 integrate .. //depot/projects/hammer/sys/conf/files.ia64#16 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#20 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#14 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#9 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_subr.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#26 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#6 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC.hints#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/ia64/include/_types.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/reg.h#5 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#3 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#34 integrate .. //depot/projects/hammer/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/_types.h#5 integrate .. //depot/projects/hammer/sys/sys/types.h#12 integrate .. //depot/projects/hammer/sys/sys/uio.h#7 integrate Differences ... ==== //depot/projects/hammer/etc/ftpusers#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.12 2004/03/20 19:13:06 maxim Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -14,6 +14,7 @@ man sshd bind +proxy uucp pop www ==== //depot/projects/hammer/etc/mail/aliases#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.19 2004/03/20 19:13:06 maxim Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -34,6 +34,7 @@ nobody: root operator: root pop: root +proxy: root smmsp: postmaster sshd: root system: root ==== //depot/projects/hammer/etc/rc.d/devfs#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.7 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.8 2004/03/20 07:10:16 green Exp $ # # PROVIDE: devfs @@ -16,10 +16,23 @@ devfs_start() { - if [ -n "$devfs_system_ruleset" ]; then + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then devfs_init_rulesets - devfs_set_ruleset $devfs_system_ruleset /dev - devfs_apply_ruleset $devfs_system_ruleset /dev + if [ -n "$devfs_system_ruleset" ]; then + devfs_set_ruleset $devfs_system_ruleset /dev + devfs_apply_ruleset $devfs_system_ruleset /dev + fi + if [ -n "$devfs_set_rulesets" ]; then + local _dir_set + local _dir + local _set + for _dir_set in $devfs_set_rulesets; do + _dir=${_dir_set%=*} + _set=${_dir_set#*=} + devfs_set_ruleset $_set $_dir + devfs_apply_ruleset $_set $_dir + done + fi fi read_devfs_conf } ==== //depot/projects/hammer/include/stdio.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.53 2004/03/17 01:43:07 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.54 2004/03/20 11:45:52 tjr Exp $ */ #ifndef _STDIO_H_ @@ -418,16 +418,16 @@ extern int __isthreaded; -#define feof(p) (!__isthreaded ? __sfeof(p) : feof(p)) -#define ferror(p) (!__isthreaded ? __sferror(p) : ferror(p)) -#define clearerr(p) (!__isthreaded ? __sclearerr(p) : clearerr(p)) +#define feof(p) (!__isthreaded ? __sfeof(p) : (feof)(p)) +#define ferror(p) (!__isthreaded ? __sferror(p) : (ferror)(p)) +#define clearerr(p) (!__isthreaded ? __sclearerr(p) : (clearerr)(p)) #if __POSIX_VISIBLE -#define fileno(p) (!__isthreaded ? __sfileno(p) : fileno(p)) +#define fileno(p) (!__isthreaded ? __sfileno(p) : (fileno)(p)) #endif -#define getc(fp) (!__isthreaded ? __sgetc(fp) : getc(fp)) -#define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : putc(x, fp)) +#define getc(fp) (!__isthreaded ? __sgetc(fp) : (getc)(fp)) +#define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : (putc)(x, fp)) #define getchar() getc(stdin) #define putchar(x) putc(x, stdout) ==== //depot/projects/hammer/lib/libarchive/Makefile#3 (text+ko) ==== @@ -1,8 +1,14 @@ # Makefile for libarchive. # -# $FreeBSD: src/lib/libarchive/Makefile,v 1.3 2004/03/09 19:50:41 kientzle Exp $ -# +# $FreeBSD: src/lib/libarchive/Makefile,v 1.4 2004/03/19 22:37:06 kientzle Exp $ + LIB= archive +SHLIB_MAJOR= 1 + +# I'm not yet ready for a shared version of this library, as +# there are still a couple of API changes still in the works. +NOSHLIBS= 1 + SRCS= archive_check_magic.c \ archive_entry.c \ archive_read.c \ @@ -114,8 +120,8 @@ CFLAGS+= -DHAVE_DMALLOC -I/usr/local/include LDFLAGS+= -L/usr/local/lib -ldmalloc .endif +CFLAGS+= -O3 -# Should be WARNS=6, except that zlib.h is borked. -WARNS?= 3 +WARNS?= 6 .include ==== //depot/projects/hammer/lib/libarchive/archive.h#4 (text+ko) ==== @@ -23,15 +23,14 @@ * (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/lib/libarchive/archive.h,v 1.4 2004/03/09 19:50:41 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.5 2004/03/19 22:37:06 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED #define ARCHIVE_H_INCLUDED -#include -#include -#include +#include /* For int64_t */ +#include /* For ssize_t and size_t */ #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 ==== //depot/projects/hammer/lib/libarchive/archive_entry.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.1 2004/02/09 23:22:53 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.2 2004/03/19 22:37:06 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -30,13 +30,20 @@ .Sh NAME .Nm archive_entry_clear .Nm archive_entry_clone +.Nm archive_entry_copy_gname_w +.Nm archive_entry_copy_hardlink_w +.Nm archive_entry_copy_pathname_w .Nm archive_entry_copy_stat -.Nm archive_entry_dup +.Nm archive_entry_copy_symlink_w +.Nm archive_entry_copy_uname_w .Nm archive_entry_free .Nm archive_entry_gname +.Nm archive_entry_gname_w .Nm archive_entry_hardlink +.Nm archive_entry_hardlink_w .Nm archive_entry_new .Nm archive_entry_pathname +.Nm archive_entry_pathname_w .Nm archive_entry_set_devmajor .Nm archive_entry_set_devminor .Nm archive_entry_set_gid @@ -51,8 +58,10 @@ .Nm archive_entry_size .Nm archive_entry_stat .Nm archive_entry_symlink +.Nm archive_entry_symlink_w .Nm archive_entry_tartype .Nm archive_entry_uname +.Nm archive_entry_uname_w .Nd functions for manipulating archive entry descriptions .Sh SYNOPSIS .In archive_entry.h @@ -61,19 +70,33 @@ .Ft struct archive_entry * .Fn archive_entry_clone "struct archive_entry *" .Ft void +.Fn archive_entry_copy_gname_w "struct archive_entry *" "const wchar_t *" +.Ft void +.Fn archive_entry_copy_hardlink_w "struct archive_entry *" "const wchar_t *" +.Ft void +.Fn archive_entry_copy_pathname_w "struct archive_entry *" "const wchar_t *" +.Ft void .Fn archive_entry_copy_stat "struct archive_entry *" "struct stat *" -.Ft struct archive_entry * -.Fn archive_entry_dup "struct archive_entry *" +.Ft void +.Fn archive_entry_copy_symlink_w "struct archive_entry *" "const wchar_t *" +.Ft void +.Fn archive_entry_copy_uname_w "struct archive_entry *" "const wchar_t *" .Ft void .Fn archive_entry_free "struct archive_entry *" .Ft const char * .Fn archive_entry_gname "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_gname_w "struct archive_entry *" .Ft const char * .Fn archive_entry_hardlink "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_hardlink_w "struct archive_entry *" .Ft struct archive_entry * .Fn archive_entry_new "void" .Ft const char * .Fn archive_entry_pathname "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_pathname_w "struct archive_entry *" .Ft void .Fn archive_entry_set_devmajor "struct archive_entry *" "dev_t" .Ft void @@ -102,25 +125,65 @@ .Fn archive_entry_stat "struct archive_entry *" .Ft const char * .Fn archive_entry_symlink "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_symlink_w "struct archive_entry *" .Ft int .Fn archive_entry_tartype "struct archive_entry *" .Ft const char * .Fn archive_entry_uname "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_uname_w "struct archive_entry *" .Sh DESCRIPTION These functions create and manipulate data objects that represent entries within an archive. You can think of a .Tn struct archive_entry -as a +as a heavy-duty version of +.Tn struct stat : +it includes everything from .Tn struct stat -on steroids: it includes everything from -.Tn struct stat plus associated pathname, textual group and user names, etc. These objects are used by .Xr libarchive 3 to represent the metadata associated with a particular entry in an archive. +.Pp +Most of the functions here set or read entries +in an object. Such functions have one of the +following forms: .Bl -tag -compact -width indent +.It Fn archive_entry_set_XXXX +Stores the provided data in the object. +In particular, for strings, the pointer is stored, +not the referenced string. +.It Fn archive_entry_copy_XXXX +As above, except that the referenced data is copied +into the object. +.It Fn archive_entry_XXXX +Returns the specified data. +In the case of strings, a const-qualified pointer to +the string is returned. +.El +The string data can be accessed as wide character strings +(which are suffixed with +.Cm _w ) +or normal +.Va char +strings. +Note that these are different representations of the same +data: +For example, if you store a narrow string and read the corresponding +wide string, the object will transparently convert formats +using the current locale. +Similarly, if you store a wide string and then store a +narrow string for the same data, the previously-set wide string will +be discarded in favor of the new data. +.Pp +The remaining functions allocate, destroy, clear, and copy +.Va archive_entry +objects. +These functions are described below: +.Bl -tag -compact -width indent .It Fn archive_entry_clear Erases the object, resetting all internal fields to the same state as a newly-created object. @@ -128,76 +191,20 @@ without thrashing the heap. .It Fn archive_entry_clone A deep copy operation; all text fields are duplicated. -.It Fn archive_entry_copy_stat -Copies the contents of the provided -.Tn struct stat -into the -.Tn struct archive_entry -object. -.It Fn archive_entry_dup -A shallow copy; text fields are not duplicated. .It Fn archive_entry_free Releases the .Tn struct archive_entry object. -.It Fn archive_entry_gname -Returns a pointer to the textual group name. -.It Fn archive_entry_hardlink -If this function returns non-NULL, then this object represents -a hardlink to another filesystem object. -The contents contain the pathname of the object. .It Fn archive_entry_new Allocate and return a blank .Tn struct archive_entry object. -.It Fn archive_entry_pathname -Returns a pointer to the pathname. -.It Fn archive_entry_set_devmajor -Sets the device major number (only valid for objects representing -block and character devices). -.It Fn archive_entry_set_devminor -Sets the device minor number (only valid for objects representing -block and character devices). -.It Fn archive_entry_set_gid -Sets the group ID for the object. -.It Fn archive_entry_set_gname -Sets a pointer to the textual group name. -Note that the name itself is not copied. -.It Fn archive_entry_set_hardlink -Sets the hardlink property; see -.Fn archive_entry_hardlink -above. -.It Fn archive_entry_set_mode -Sets the file mode. -.It Fn archive_entry_set_pathname -Sets a pointer to the pathname. -Note that the pathname text is not copied. -.It Fn archive_entry_set_symlink -Sets a pointer to the contents of a symbolic link. -Note that the pathname text is not copied. .It Fn archive_entry_set_tartype Sets the value to be used in a tar-format header for this entry. Client code should generally not set this; if it is left unset, the library will automatically determine an appropriate value. -.It Fn archive_entry_set_uid -Set the user ID for the object. -.It Fn archive_entry_set_uname -Sets a pointer to the textual user name. -Note that the name itself is not copied. -.It Fn archive_entry_size -Returns the size of the object on disk in bytes. -.It Fn archive_entry_stat -Returns a pointer to a populated -.Tn struct stat . -.It Fn archive_entry_symlink -Returns a pointer to the symlink contents. -.It Fn archive_entry_tartype -Returns the value used in a tar-format header. -Not generally useful to clients. -.It Fn archive_entry_uname -Returns a pointer to the textual user name. .El .\" .Sh EXAMPLE .\" .Sh RETURN VALUES @@ -215,4 +222,4 @@ .Nm libarchive library was written by .An Tim Kientzle Aq kientzle@acm.org . -.Sh BUGS +.\" .Sh BUGS ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -25,19 +25,42 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.3 2004/03/19 22:37:06 kientzle Exp $"); #include #include #ifdef HAVE_DMALLOC #include #endif +#include #include #include +#include #include "archive_entry.h" /* + * Handle wide character (i.e., Unicode) and non-wide character + * strings transparently. + * + */ + +struct aes { + const char *aes_mbs; + char *aes_mbs_alloc; + const wchar_t *aes_wcs; + wchar_t *aes_wcs_alloc; +}; + +void aes_clean(struct aes *); +void aes_copy(struct aes *dest, struct aes *src); +const char * aes_get_mbs(struct aes *); +const wchar_t * aes_get_wcs(struct aes *); +void aes_set_mbs(struct aes *, const char *mbs); +void aes_set_wcs(struct aes *, const wchar_t *wcs); +void aes_copy_wcs(struct aes *, const wchar_t *wcs); + +/* * Description of an archive entry. * * Basically, this is a "struct stat" with a few text fields added in. @@ -70,124 +93,175 @@ int ae_tartype; /* - * Note: If you add any more string fields, update - * archive_entry_clone accordingly. + * Use aes here so that we get transparent mbs<->wcs conversions. */ - const char *ae_acl; /* ACL text */ - const char *ae_acl_default; /* default ACL */ - const char *ae_fflags; /* Text fflags per fflagstostr(3) */ - const char *ae_gname; /* Name of owning group */ - const char *ae_hardlink; /* Name of target for hardlink */ - const char *ae_pathname; /* Name of entry */ - const char *ae_symlink; /* symlink contents */ - const char *ae_uname; /* Name of owner */ - - char buff[1]; /* MUST BE AT END OF STRUCT!!! */ + struct aes ae_acl; /* ACL text */ + struct aes ae_acl_default; /* default ACL */ + struct aes ae_fflags; /* Text fflags per fflagstostr(3) */ + struct aes ae_gname; /* Name of owning group */ + struct aes ae_hardlink; /* Name of target for hardlink */ + struct aes ae_pathname; /* Name of entry */ + struct aes ae_symlink; /* symlink contents */ + struct aes ae_uname; /* Name of owner */ }; -struct archive_entry * -archive_entry_clear(struct archive_entry *entry) +void +aes_clean(struct aes *aes) { - memset(entry, 0, sizeof(*entry)); - entry->ae_tartype = -1; - return entry; + if (aes->aes_mbs_alloc) { + free(aes->aes_mbs_alloc); + aes->aes_mbs_alloc = NULL; + } + if (aes->aes_wcs_alloc) { + free(aes->aes_wcs_alloc); + aes->aes_wcs_alloc = NULL; + } + memset(aes, 0, sizeof(*aes)); } -struct archive_entry * -archive_entry_clone(struct archive_entry *entry) +void +aes_copy(struct aes *dest, struct aes *src) { - int size; - struct archive_entry *entry2; - char *p; + *dest = *src; + if (src->aes_mbs_alloc != NULL) { + dest->aes_mbs_alloc = strdup(src->aes_mbs_alloc); + dest->aes_mbs = dest->aes_mbs_alloc; + } - size = sizeof(*entry2); - if (entry->ae_acl) - size += strlen(entry->ae_acl) + 1; - if (entry->ae_acl_default) - size += strlen(entry->ae_acl_default) + 1; - if (entry->ae_fflags) - size += strlen(entry->ae_fflags) + 1; - if (entry->ae_gname) - size += strlen(entry->ae_gname) + 1; - if (entry->ae_hardlink) - size += strlen(entry->ae_hardlink) + 1; - if (entry->ae_pathname) - size += strlen(entry->ae_pathname) + 1; - if (entry->ae_symlink) - size += strlen(entry->ae_symlink) + 1; - if (entry->ae_uname) - size += strlen(entry->ae_uname) + 1; + if (src->aes_wcs_alloc != NULL) { + dest->aes_wcs_alloc = malloc((wcslen(src->aes_wcs_alloc) + 1) + * sizeof(wchar_t)); + dest->aes_wcs = dest->aes_wcs_alloc; + wcscpy(dest->aes_wcs_alloc, src->aes_wcs); + } +} - entry2 = malloc(size); - *entry2 = *entry; - - /* Copy all of the strings from the original. */ - p = entry2->buff; - - if (entry->ae_acl) { - entry2->ae_acl = p; - strcpy(p, entry->ae_acl); - p += strlen(p) + 1; +const char * +aes_get_mbs(struct aes *aes) +{ + if (aes->aes_mbs == NULL && aes->aes_wcs != NULL) { + /* + * XXX Need to estimate the number of byte in the + * multi-byte form. Assume that, on average, wcs + * chars encode to no more than 3 bytes. There must + * be a better way... XXX + */ + int mbs_length = wcslen(aes->aes_wcs) * 3 + 64; + aes->aes_mbs_alloc = malloc(mbs_length); + aes->aes_mbs = aes->aes_mbs_alloc; + wcstombs(aes->aes_mbs_alloc, aes->aes_wcs, mbs_length - 1); + aes->aes_mbs_alloc[mbs_length - 1] = 0; } + return (aes->aes_mbs); +} - if (entry->ae_acl_default) { - entry2->ae_acl_default = p; - strcpy(p, entry->ae_acl_default); - p += strlen(p) + 1; +const wchar_t * +aes_get_wcs(struct aes *aes) +{ + if (aes->aes_wcs == NULL && aes->aes_mbs != NULL) { + /* + * No single byte will be more than one wide character, + * so this length estimate will always be big enough. + */ + int wcs_length = strlen(aes->aes_mbs); + aes->aes_wcs_alloc + = malloc((wcs_length + 1) * sizeof(wchar_t)); + aes->aes_wcs = aes->aes_wcs_alloc; + mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); + aes->aes_wcs_alloc[wcs_length] = 0; } + return (aes->aes_wcs); +} - if (entry->ae_fflags) { - entry2->ae_fflags = p; - strcpy(p, entry->ae_fflags); - p += strlen(p) + 1; +void +aes_set_mbs(struct aes *aes, const char *mbs) +{ + if (aes->aes_mbs_alloc) { + free(aes->aes_mbs_alloc); + aes->aes_mbs_alloc = NULL; } - - if (entry->ae_gname) { - entry2->ae_gname = p; - strcpy(p, entry->ae_gname); - p += strlen(p) + 1; + if (aes->aes_wcs_alloc) { + free(aes->aes_wcs_alloc); + aes->aes_wcs_alloc = NULL; } + aes->aes_mbs = mbs; + aes->aes_wcs = NULL; +} - if (entry->ae_hardlink) { - entry2->ae_hardlink = p; - strcpy(p, entry->ae_hardlink); - p += strlen(p) + 1; +void +aes_set_wcs(struct aes *aes, const wchar_t *wcs) +{ + if (aes->aes_mbs_alloc) { + free(aes->aes_mbs_alloc); + aes->aes_mbs_alloc = NULL; } - - if (entry->ae_pathname) { - entry2->ae_pathname = p; - strcpy(p, entry->ae_pathname); - p += strlen(p) + 1; + if (aes->aes_wcs_alloc) { + free(aes->aes_wcs_alloc); + aes->aes_wcs_alloc = NULL; } + aes->aes_mbs = NULL; + aes->aes_wcs = wcs; +} - if (entry->ae_symlink) { - entry2->ae_symlink = p; - strcpy(p, entry->ae_symlink); - p += strlen(p) + 1; +void +aes_copy_wcs(struct aes *aes, const wchar_t *wcs) +{ + if (aes->aes_mbs_alloc) { + free(aes->aes_mbs_alloc); + aes->aes_mbs_alloc = NULL; } - - if (entry->ae_uname) { - entry2->ae_uname = p; - strcpy(p, entry->ae_uname); - p += strlen(p) + 1; + if (aes->aes_wcs_alloc) { + free(aes->aes_wcs_alloc); + aes->aes_wcs_alloc = NULL; } + aes->aes_mbs = NULL; + aes->aes_wcs_alloc = malloc((wcslen(wcs) + 1) * sizeof(wchar_t)); + wcscpy(aes->aes_wcs_alloc, wcs); + aes->aes_wcs = aes->aes_wcs_alloc; +} - return (entry2); +struct archive_entry * +archive_entry_clear(struct archive_entry *entry) +{ + aes_clean(&entry->ae_acl); + aes_clean(&entry->ae_acl_default); + aes_clean(&entry->ae_fflags); + aes_clean(&entry->ae_gname); + aes_clean(&entry->ae_hardlink); + aes_clean(&entry->ae_pathname); + aes_clean(&entry->ae_symlink); + aes_clean(&entry->ae_uname); + memset(entry, 0, sizeof(*entry)); + entry->ae_tartype = -1; + return entry; } struct archive_entry * -archive_entry_dup(struct archive_entry *entry) +archive_entry_clone(struct archive_entry *entry) { struct archive_entry *entry2; + /* Allocate new structure and copy over all of the fields. */ entry2 = malloc(sizeof(*entry2)); - *entry2 = *entry; + entry2->ae_stat = entry->ae_stat; + entry2->ae_tartype = entry->ae_tartype; + + aes_copy(&entry2->ae_acl ,&entry->ae_acl); + aes_copy(&entry2->ae_acl_default ,&entry->ae_acl_default); + aes_copy(&entry2->ae_fflags ,&entry->ae_fflags); + aes_copy(&entry2->ae_gname ,&entry->ae_gname); + aes_copy(&entry2->ae_hardlink ,&entry->ae_hardlink); + aes_copy(&entry2->ae_pathname, &entry->ae_pathname); + aes_copy(&entry2->ae_symlink ,&entry->ae_symlink); + aes_copy(&entry2->ae_uname ,&entry->ae_uname); + return (entry2); } void archive_entry_free(struct archive_entry *entry) { + archive_entry_clear(entry); free(entry); } @@ -199,11 +273,11 @@ entry = malloc(sizeof(*entry)); if(entry == NULL) return (NULL); - archive_entry_clear(entry); + memset(entry, 0, sizeof(*entry)); + entry->ae_tartype = -1; return (entry); } - /* * Functions for reading fields from an archive_entry. */ @@ -211,14 +285,14 @@ const char * archive_entry_acl(struct archive_entry *entry) { - return (entry->ae_acl); + return (aes_get_mbs(&entry->ae_acl)); } const char * archive_entry_acl_default(struct archive_entry *entry) { - return (entry->ae_acl_default); + return (aes_get_mbs(&entry->ae_acl_default)); } dev_t @@ -237,19 +311,19 @@ const char * archive_entry_fflags(struct archive_entry *entry) { - return (entry->ae_fflags); + return (aes_get_mbs(&entry->ae_fflags)); } const char * archive_entry_gname(struct archive_entry *entry) { - return (entry->ae_gname); + return (aes_get_mbs(&entry->ae_gname)); } const char * archive_entry_hardlink(struct archive_entry *entry) { - return (entry->ae_hardlink); + return (aes_get_mbs(&entry->ae_hardlink)); } mode_t @@ -261,7 +335,13 @@ const char * archive_entry_pathname(struct archive_entry *entry) { - return (entry->ae_pathname); + return (aes_get_mbs(&entry->ae_pathname)); +} + +const wchar_t * +archive_entry_pathname_w(struct archive_entry *entry) +{ + return (aes_get_wcs(&entry->ae_pathname)); } int64_t @@ -279,7 +359,7 @@ const char * archive_entry_symlink(struct archive_entry *entry) { - return (entry->ae_symlink); + return (aes_get_mbs(&entry->ae_symlink)); } int @@ -291,7 +371,7 @@ const char * archive_entry_uname(struct archive_entry *entry) { - return (entry->ae_uname); + return (aes_get_mbs(&entry->ae_uname)); } /* @@ -311,14 +391,25 @@ void archive_entry_set_acl(struct archive_entry *entry, const char *acl) { - entry->ae_acl = acl; + aes_set_mbs(&entry->ae_acl, acl); } +void +archive_entry_copy_acl_w(struct archive_entry *entry, const wchar_t *acl) +{ + aes_copy_wcs(&entry->ae_acl, acl); +} void archive_entry_set_acl_default(struct archive_entry *entry, const char *acl) { - entry->ae_acl_default = acl; + aes_set_mbs(&entry->ae_acl_default, acl); +} + +void +archive_entry_copy_acl_default_w(struct archive_entry *entry, const wchar_t *acl) +{ + aes_copy_wcs(&entry->ae_acl_default, acl); } void @@ -342,7 +433,13 @@ void archive_entry_set_fflags(struct archive_entry *entry, const char *flags) { - entry->ae_fflags = flags; + aes_set_mbs(&entry->ae_fflags, flags); +} + +void +archive_entry_copy_fflags_w(struct archive_entry *entry, const wchar_t *flags) +{ + aes_copy_wcs(&entry->ae_fflags, flags); } void @@ -354,13 +451,25 @@ void archive_entry_set_gname(struct archive_entry *entry, const char *name) { - entry->ae_gname = name; + aes_set_mbs(&entry->ae_gname, name); +} + +void +archive_entry_copy_gname_w(struct archive_entry *entry, const wchar_t *name) +{ + aes_copy_wcs(&entry->ae_gname, name); } void archive_entry_set_hardlink(struct archive_entry *entry, const char *target) { - entry->ae_hardlink = target; + aes_set_mbs(&entry->ae_hardlink, target); +} + +void +archive_entry_copy_hardlink_w(struct archive_entry *entry, const wchar_t *target) +{ + aes_copy_wcs(&entry->ae_hardlink, target); } void @@ -372,7 +481,13 @@ void archive_entry_set_pathname(struct archive_entry *entry, const char *name) { - entry->ae_pathname = name; + aes_set_mbs(&entry->ae_pathname, name); +} + +void +archive_entry_copy_pathname_w(struct archive_entry *entry, const wchar_t *name) +{ + aes_copy_wcs(&entry->ae_pathname, name); } void @@ -382,9 +497,15 @@ } void -archive_entry_set_symlink(struct archive_entry *entry, const char *link) +archive_entry_set_symlink(struct archive_entry *entry, const char *linkname) +{ + aes_set_mbs(&entry->ae_symlink, linkname); +} + +void +archive_entry_copy_symlink_w(struct archive_entry *entry, const wchar_t *linkname) { - entry->ae_symlink = link; + aes_copy_wcs(&entry->ae_symlink, linkname); } void @@ -402,6 +523,26 @@ void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 20 17:51:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81EBF16A4D0; Sat, 20 Mar 2004 17:51:36 -0800 (PST) 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 40DA116A4CE for ; Sat, 20 Mar 2004 17:51:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22DD143D2D for ; Sat, 20 Mar 2004 17:51:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L1pZGe005607 for ; Sat, 20 Mar 2004 17:51:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L1pZI0005601 for perforce@freebsd.org; Sat, 20 Mar 2004 17:51:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 20 Mar 2004 17:51:35 -0800 (PST) Message-Id: <200403210151.i2L1pZI0005601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 01:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=49422 Change 49422 by peter@peter_overcee on 2004/03/20 17:50:46 IFC @49421 Affected files ... .. //depot/projects/hammer/lib/csu/amd64/crti.S#6 integrate .. //depot/projects/hammer/lib/csu/amd64/crtn.S#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#14 integrate .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#8 integrate Differences ... ==== //depot/projects/hammer/lib/csu/amd64/crti.S#6 (text+ko) ==== @@ -38,4 +38,4 @@ subq $8,%rsp .section .rodata -.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.7 2004/03/21 01:39:01 peter Exp $\0" ==== //depot/projects/hammer/lib/csu/amd64/crtn.S#6 (text+ko) ==== @@ -32,4 +32,4 @@ ret .section .rodata -.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.6 2004/03/21 01:39:01 peter Exp $\0" ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#14 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/amd64/rtld_start.S,v 1.4 2003/05/24 17:37:51 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $ */ .text ==== //depot/projects/hammer/sys/ia64/include/cpufunc.h#8 (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/ia64/include/cpufunc.h,v 1.19 2004/01/13 15:30:36 des Exp $ + * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.20 2004/03/21 01:41:29 marcel Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -37,15 +37,16 @@ struct thread; +#define IA64_FIXED_BREAK 0x84B5D + #ifdef __GNUC__ static __inline void breakpoint(void) { - __asm __volatile("break 0x80100"); /* XXX use linux value */ + __asm __volatile("break.m %0" :: "i"(IA64_FIXED_BREAK)); } - #define HAVE_INLINE_FFS static __inline int From owner-p4-projects@FreeBSD.ORG Sat Mar 20 18:08:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18FEF16A4D0; Sat, 20 Mar 2004 18:08:58 -0800 (PST) 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 B045716A4CE for ; Sat, 20 Mar 2004 18:08:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90B8C43D39 for ; Sat, 20 Mar 2004 18:08:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L28vGe009725 for ; Sat, 20 Mar 2004 18:08:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L28vFx009722 for perforce@freebsd.org; Sat, 20 Mar 2004 18:08:57 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 20 Mar 2004 18:08:57 -0800 (PST) Message-Id: <200403210208.i2L28vFx009722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 02:08:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=49423 Change 49423 by peter@peter_overcee on 2004/03/20 18:08:14 move lib32 from mtree (where it affects all platforms) to the hack build script Affected files ... .. //depot/projects/hammer/build32.sh#5 edit .. //depot/projects/hammer/etc/mtree/BSD.local.dist#16 edit .. //depot/projects/hammer/etc/mtree/BSD.root.dist#7 edit .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#20 edit .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#6 edit .. //depot/projects/hammer/etc/mtree/BSD.x11.dist#3 edit Differences ... ==== //depot/projects/hammer/build32.sh#5 (text+kox) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $P4: //depot/projects/hammer/build32.sh#4 $ +# $P4: //depot/projects/hammer/build32.sh#5 $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -11,6 +11,11 @@ # XXX installation of includes. ie: it will re-install some files in # XXX /usr/include for you. +mkdir /lib32 +mkdir /usr/lib32 +mkdir /usr/local/lib32 +mkdir /usr/X11R6/lib32 + # Set up an obj tree chflags -R noschg /tmp/i386 rm -rf /tmp/i386 ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#16 (text+ko) ==== @@ -19,8 +19,6 @@ .. lib .. - lib32 - .. libdata .. libexec ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#7 (text+ko) ==== @@ -63,8 +63,6 @@ .. lib .. - lib32 - .. libexec .. mnt ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#20 (text+ko) ==== @@ -19,8 +19,6 @@ .. .. .. - lib32 - .. libdata doscmd fonts ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#6 (text+ko) ==== @@ -347,8 +347,6 @@ .. .. .. - lib32 - .. libdata pkgconfig .. ==== //depot/projects/hammer/etc/mtree/BSD.x11.dist#3 (text+ko) ==== @@ -191,8 +191,6 @@ modules .. .. - lib32 - .. libdata .. libexec From owner-p4-projects@FreeBSD.ORG Sat Mar 20 18:24:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E9B016A4D0; Sat, 20 Mar 2004 18:24:25 -0800 (PST) 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 6D78916A4CE for ; Sat, 20 Mar 2004 18:24:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61AF343D45 for ; Sat, 20 Mar 2004 18:24:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L2OPGe013881 for ; Sat, 20 Mar 2004 18:24:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L2OGJF013878 for perforce@freebsd.org; Sat, 20 Mar 2004 18:24:16 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 18:24:16 -0800 (PST) Message-Id: <200403210224.i2L2OGJF013878@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 Subject: PERFORCE change 49424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 02:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=49424 Change 49424 by marcel@marcel_nfs on 2004/03/20 18:23:25 IFC @49421 Affected files ... .. //depot/projects/ia64/MAINTAINERS#38 integrate .. //depot/projects/ia64/Makefile#37 integrate .. //depot/projects/ia64/Makefile.inc1#89 integrate .. //depot/projects/ia64/UPDATING#62 integrate .. //depot/projects/ia64/UPDATING.64BTT#1 branch .. //depot/projects/ia64/bin/date/date.c#7 integrate .. //depot/projects/ia64/bin/dd/Makefile#6 integrate .. //depot/projects/ia64/bin/dd/args.c#7 integrate .. //depot/projects/ia64/bin/dd/dd.1#5 integrate .. //depot/projects/ia64/bin/dd/dd.c#7 integrate .. //depot/projects/ia64/bin/dd/dd.h#4 integrate .. //depot/projects/ia64/bin/dd/gen.c#1 branch .. //depot/projects/ia64/bin/dd/ref.ascii#1 branch .. //depot/projects/ia64/bin/dd/ref.ebcdic#1 branch .. //depot/projects/ia64/bin/dd/ref.ibm#1 branch .. //depot/projects/ia64/bin/dd/ref.lcase#1 branch .. //depot/projects/ia64/bin/dd/ref.oldascii#1 branch .. //depot/projects/ia64/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/ia64/bin/dd/ref.oldibm#1 branch .. //depot/projects/ia64/bin/dd/ref.pareven#1 branch .. //depot/projects/ia64/bin/dd/ref.parnone#1 branch .. //depot/projects/ia64/bin/dd/ref.parodd#1 branch .. //depot/projects/ia64/bin/dd/ref.parset#1 branch .. //depot/projects/ia64/bin/dd/ref.swab#1 branch .. //depot/projects/ia64/bin/dd/ref.ucase#1 branch .. //depot/projects/ia64/bin/df/df.c#19 integrate .. //depot/projects/ia64/bin/kill/kill.c#7 integrate .. //depot/projects/ia64/bin/ls/print.c#15 integrate .. //depot/projects/ia64/bin/pax/cache.c#6 integrate .. //depot/projects/ia64/bin/pax/options.c#9 integrate .. //depot/projects/ia64/bin/ps/ps.1#20 integrate .. //depot/projects/ia64/bin/ps/ps.c#14 integrate .. //depot/projects/ia64/bin/sh/Makefile#9 integrate .. //depot/projects/ia64/contrib/binutils/include/getopt.h#3 delete .. //depot/projects/ia64/contrib/binutils/libiberty/getopt.c#3 delete .. //depot/projects/ia64/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/ia64/contrib/diff/diff.h#3 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#19 integrate .. //depot/projects/ia64/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/ia64/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/ia64/contrib/sort/Makefile#2 delete .. //depot/projects/ia64/contrib/sort/append.c#2 delete .. //depot/projects/ia64/contrib/sort/extern.h#2 delete .. //depot/projects/ia64/contrib/sort/fields.c#2 delete .. //depot/projects/ia64/contrib/sort/files.c#2 delete .. //depot/projects/ia64/contrib/sort/fsort.c#2 delete .. //depot/projects/ia64/contrib/sort/fsort.h#2 delete .. //depot/projects/ia64/contrib/sort/init.c#3 delete .. //depot/projects/ia64/contrib/sort/msort.c#2 delete .. //depot/projects/ia64/contrib/sort/pathnames.h#2 delete .. //depot/projects/ia64/contrib/sort/regress/Makefile#2 delete .. //depot/projects/ia64/contrib/sort/regress/stests#2 delete .. //depot/projects/ia64/contrib/sort/sort.1#2 delete .. //depot/projects/ia64/contrib/sort/sort.c#3 delete .. //depot/projects/ia64/contrib/sort/sort.h#2 delete .. //depot/projects/ia64/contrib/sort/tmp.c#2 delete .. //depot/projects/ia64/crypto/openssh/sshd_config#16 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#12 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#7 integrate .. //depot/projects/ia64/crypto/openssl/Configure#7 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#7 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#4 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.org#7 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.ssl#7 integrate .. //depot/projects/ia64/crypto/openssl/NEWS#7 integrate .. //depot/projects/ia64/crypto/openssl/README#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile.ssl#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/dgst.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs7.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/req.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_time.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/speed.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/x509.c#6 integrate .. //depot/projects/ia64/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/ia64/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/ia64/crypto/openssl/config#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_gentm.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_time.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_utctm.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/t_pkey.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bf/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_print.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_sock.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bio_cb.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_file.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/Makefile.ssl#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cast/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/comp/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/cfb_enc.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/ecb_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/krb5/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/mem.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_dat.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_dat.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslv.h#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_doit.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc4/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc5/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ripemd/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/threads/mttest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ui/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_txt.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/openssl.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_client.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/apps/smime.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_DigestInit.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/des.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssleay.txt#3 integrate .. //depot/projects/ia64/crypto/openssl/openssl.spec#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_clnt.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_enc.c#5 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_pkt.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_srvr.c#5 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_clnt.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_enc.c#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_pkt.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl.h#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_asn1.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_cert.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_lib.c#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_sess.c#5 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssltest.c#6 integrate .. //depot/projects/ia64/crypto/openssl/test/Makefile.ssl#6 integrate .. //depot/projects/ia64/crypto/openssl/tools/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/ia64/crypto/openssl/util/extract-names.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/util/mk1mf.pl#6 integrate .. //depot/projects/ia64/crypto/openssl/util/mkdef.pl#6 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/ia64/etc/Makefile#40 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#47 integrate .. //depot/projects/ia64/etc/devd.conf#11 integrate .. //depot/projects/ia64/etc/ftpusers#6 integrate .. //depot/projects/ia64/etc/group#7 integrate .. //depot/projects/ia64/etc/inetd.conf#12 integrate .. //depot/projects/ia64/etc/mail/aliases#8 integrate .. //depot/projects/ia64/etc/master.passwd#6 integrate .. //depot/projects/ia64/etc/pccard_ether#13 integrate .. //depot/projects/ia64/etc/pf.conf#1 branch .. //depot/projects/ia64/etc/pf.os#1 branch .. //depot/projects/ia64/etc/protocols#5 integrate .. //depot/projects/ia64/etc/rc#28 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#25 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#7 integrate .. //depot/projects/ia64/etc/rc.d/abi#3 integrate .. //depot/projects/ia64/etc/rc.d/accounting#6 integrate .. //depot/projects/ia64/etc/rc.d/addswap#3 integrate .. //depot/projects/ia64/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/ia64/etc/rc.d/amd#9 integrate .. //depot/projects/ia64/etc/rc.d/apm#5 integrate .. //depot/projects/ia64/etc/rc.d/apmd#10 integrate .. //depot/projects/ia64/etc/rc.d/archdep#6 integrate .. //depot/projects/ia64/etc/rc.d/atm1#6 integrate .. //depot/projects/ia64/etc/rc.d/atm2#2 integrate .. //depot/projects/ia64/etc/rc.d/atm3#3 integrate .. //depot/projects/ia64/etc/rc.d/bgfsck#5 integrate .. //depot/projects/ia64/etc/rc.d/bootparams#5 integrate .. //depot/projects/ia64/etc/rc.d/ccd#4 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#7 integrate .. //depot/projects/ia64/etc/rc.d/devd#6 integrate .. //depot/projects/ia64/etc/rc.d/devfs#7 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#11 integrate .. //depot/projects/ia64/etc/rc.d/diskless#12 integrate .. //depot/projects/ia64/etc/rc.d/dmesg#3 integrate .. //depot/projects/ia64/etc/rc.d/dumpon#3 integrate .. //depot/projects/ia64/etc/rc.d/fsck#6 integrate .. //depot/projects/ia64/etc/rc.d/gbde#3 integrate .. //depot/projects/ia64/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/ia64/etc/rc.d/hostname#4 integrate .. //depot/projects/ia64/etc/rc.d/ike#2 integrate .. //depot/projects/ia64/etc/rc.d/initdiskless#11 integrate .. //depot/projects/ia64/etc/rc.d/initrandom#2 integrate .. //depot/projects/ia64/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/ia64/etc/rc.d/ip6fw#5 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#15 integrate .. //depot/projects/ia64/etc/rc.d/ipfs#4 integrate .. //depot/projects/ia64/etc/rc.d/ipfw#6 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#8 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#11 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#8 integrate .. //depot/projects/ia64/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#10 integrate .. //depot/projects/ia64/etc/rc.d/jail#9 integrate .. //depot/projects/ia64/etc/rc.d/kldxref#3 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#10 integrate .. //depot/projects/ia64/etc/rc.d/lomac#3 integrate .. //depot/projects/ia64/etc/rc.d/mixer#1 branch .. //depot/projects/ia64/etc/rc.d/mountcritlocal#9 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#8 integrate .. //depot/projects/ia64/etc/rc.d/mountd#10 integrate .. //depot/projects/ia64/etc/rc.d/moused#5 integrate .. //depot/projects/ia64/etc/rc.d/mroute6d#3 integrate .. //depot/projects/ia64/etc/rc.d/mrouted#7 integrate .. //depot/projects/ia64/etc/rc.d/named#8 integrate .. //depot/projects/ia64/etc/rc.d/netif#5 integrate .. //depot/projects/ia64/etc/rc.d/netoptions#4 integrate .. //depot/projects/ia64/etc/rc.d/network_ipv6#7 integrate .. //depot/projects/ia64/etc/rc.d/nfsclient#4 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#11 integrate .. //depot/projects/ia64/etc/rc.d/nfslocking#6 integrate .. //depot/projects/ia64/etc/rc.d/nfsserver#3 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#7 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#6 integrate .. //depot/projects/ia64/etc/rc.d/pccard#5 integrate .. //depot/projects/ia64/etc/rc.d/pcvt#4 integrate .. //depot/projects/ia64/etc/rc.d/power_profile#2 integrate .. //depot/projects/ia64/etc/rc.d/ppp-user#5 integrate .. //depot/projects/ia64/etc/rc.d/pppoed#2 integrate .. //depot/projects/ia64/etc/rc.d/quota#4 integrate .. //depot/projects/ia64/etc/rc.d/ramdisk#1 branch .. //depot/projects/ia64/etc/rc.d/random#5 integrate .. //depot/projects/ia64/etc/rc.d/rarpd#4 integrate .. //depot/projects/ia64/etc/rc.d/root#8 integrate .. //depot/projects/ia64/etc/rc.d/route6d#7 integrate .. //depot/projects/ia64/etc/rc.d/routed#8 integrate .. //depot/projects/ia64/etc/rc.d/routing#4 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#7 integrate .. //depot/projects/ia64/etc/rc.d/rtadvd#7 integrate .. //depot/projects/ia64/etc/rc.d/savecore#5 integrate .. //depot/projects/ia64/etc/rc.d/serial#6 integrate .. //depot/projects/ia64/etc/rc.d/sppp#3 integrate .. //depot/projects/ia64/etc/rc.d/swap1#5 integrate .. //depot/projects/ia64/etc/rc.d/syscons#6 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#6 integrate .. //depot/projects/ia64/etc/rc.d/timed#4 integrate .. //depot/projects/ia64/etc/rc.d/usbd#2 integrate .. //depot/projects/ia64/etc/rc.d/vinum#2 integrate .. //depot/projects/ia64/etc/rc.d/virecover#7 integrate .. //depot/projects/ia64/etc/rc.d/watchdogd#2 integrate .. //depot/projects/ia64/etc/rc.subr#17 integrate .. //depot/projects/ia64/games/number/number.c#3 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#17 integrate .. //depot/projects/ia64/gnu/lib/libregex/regex.c#4 integrate .. //depot/projects/ia64/gnu/lib/libregex/regex.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#11 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gasp/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/i386/bfd.h#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#7 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/ChangeLog#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/NEWS#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/THANKS#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/config.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/dfa.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/doc/grep.texi#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/doc/version.texi#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/getpagesize.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#7 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.c#4 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grepmat.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/grep/kwset.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/savedir.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/search.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/system.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/patch/patch.1#3 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/Makefile#5 integrate .. //depot/projects/ia64/include/resolv.h#6 integrate .. //depot/projects/ia64/include/stdio.h#17 integrate .. //depot/projects/ia64/installworld_newk#1 branch .. //depot/projects/ia64/installworld_oldk#1 branch .. //depot/projects/ia64/lib/Makefile#42 integrate .. //depot/projects/ia64/lib/csu/amd64/crti.S#2 integrate .. //depot/projects/ia64/lib/csu/amd64/crtn.S#2 integrate .. //depot/projects/ia64/lib/libalias/alias.c#9 integrate .. //depot/projects/ia64/lib/libalias/alias.h#7 integrate .. //depot/projects/ia64/lib/libalias/alias_cuseeme.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#10 integrate .. //depot/projects/ia64/lib/libalias/alias_ftp.c#5 integrate .. //depot/projects/ia64/lib/libalias/alias_irc.c#5 integrate .. //depot/projects/ia64/lib/libalias/alias_local.h#6 integrate .. //depot/projects/ia64/lib/libalias/alias_nbt.c#6 integrate .. //depot/projects/ia64/lib/libalias/alias_old.c#2 integrate .. //depot/projects/ia64/lib/libalias/alias_pptp.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_proxy.c#6 integrate .. //depot/projects/ia64/lib/libalias/alias_skinny.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_smedia.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_util.c#5 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#2 integrate .. //depot/projects/ia64/lib/libarchive/archive.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_gnutar.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/ia64/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/ia64/lib/libarchive/tar.5#2 integrate .. //depot/projects/ia64/lib/libbluetooth/bluetooth.c#2 integrate .. //depot/projects/ia64/lib/libbsnmp/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/flt_rounds.c#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/fpgetround.c#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/fpgetsticky.c#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/fpsetround.c#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/fpsetsticky.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlfcn.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#16 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#10 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#10 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.c#8 integrate .. //depot/projects/ia64/lib/libc/net/res_send.c#7 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/_ctx_start.S#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/makecontext.c#1 branch .. //depot/projects/ia64/lib/libc/rpc/getnetconfig.c#6 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/_flock_stub.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/feof.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/ferror.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetc.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetln.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fileno.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fputc.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/funopen.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fvwrite.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.3#8 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/getchar.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.3#5 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#7 integrate .. //depot/projects/ia64/lib/libc/stdio/putc.3#7 integrate .. //depot/projects/ia64/lib/libc/stdio/putc.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/putchar.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/puts.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/stdio.3#7 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetc.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt_long.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt_long.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#20 integrate .. //depot/projects/ia64/lib/libc/sys/mount.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#7 integrate .. //depot/projects/ia64/lib/libdisk/chunk.c#13 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#16 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#17 integrate .. //depot/projects/ia64/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/ia64/lib/libdisk/rules.c#12 integrate .. //depot/projects/ia64/lib/libgeom/Makefile#8 integrate .. //depot/projects/ia64/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.3#5 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.h#7 integrate .. //depot/projects/ia64/lib/libkiconv/xlat16_iconv.c#3 integrate .. //depot/projects/ia64/lib/libncp/ncpl_nls.c#3 integrate .. //depot/projects/ia64/lib/libpam/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_concurrency.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#14 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#10 integrate .. //depot/projects/ia64/lib/libthr/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/powerpc/powerpc/_curthread.c#1 branch .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#6 integrate .. //depot/projects/ia64/lib/libutil/Makefile#10 integrate .. //depot/projects/ia64/lib/libutil/clean_environment.3#2 delete .. //depot/projects/ia64/lib/libutil/clean_environment.c#2 delete .. //depot/projects/ia64/lib/msun/src/math.h#16 integrate .. //depot/projects/ia64/libexec/Makefile#20 integrate .. //depot/projects/ia64/libexec/getty/chat.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/Makefile#9 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_start.S#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/debug.h#2 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#11 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.h#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#23 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.h#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#33 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#77 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#138 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#18 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#17 integrate .. //depot/projects/ia64/sbin/Makefile#36 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#15 integrate .. //depot/projects/ia64/sbin/atm/atmconfig/diag.c#4 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#13 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#12 integrate .. //depot/projects/ia64/sbin/gconcat/gconcat.c#2 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#19 integrate .. //depot/projects/ia64/sbin/init/init.c#7 integrate .. //depot/projects/ia64/sbin/ip6fw/Makefile#4 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.c#10 integrate .. //depot/projects/ia64/sbin/kldconfig/kldconfig.c#4 integrate .. //depot/projects/ia64/sbin/kldstat/kldstat.c#4 integrate .. //depot/projects/ia64/sbin/ldconfig/ldconfig.c#5 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#12 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#13 integrate .. //depot/projects/ia64/sbin/mount/mount.8#15 integrate .. //depot/projects/ia64/sbin/raidctl/Makefile#2 delete .. //depot/projects/ia64/sbin/raidctl/raidctl.8#7 delete .. //depot/projects/ia64/sbin/raidctl/raidctl.c#2 delete .. //depot/projects/ia64/sbin/raidctl/rf_configure.c#2 delete .. //depot/projects/ia64/sbin/swapon/swapon.c#10 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#15 integrate .. //depot/projects/ia64/sbin/umount/umount.8#7 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#12 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#12 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ASN1_STRING_length.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ASN1_STRING_new.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_ctrl.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_base64.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_buffer.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_cipher.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_md.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_null.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_ssl.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_find_type.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_push.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_read.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_accept.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_bio.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_connect.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_fd.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_file.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_mem.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_null.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_socket.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_set_callback.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_should_retry.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_CTX_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_CTX_start.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_add.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_add_word.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_bn2bin.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_cmp.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_copy.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_generate_prime.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_inverse.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_num_bytes.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_rand.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_set_bit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_swap.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_zero.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/CONF_modules_free.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/CONF_modules_load_file.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_generate_key.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_generate_parameters.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_get_ex_new_index.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_set_method.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_size.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_SIG_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_do_sign.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_dup_DH.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_generate_key.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_generate_parameters.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_set_method.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_sign.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_size.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_GET_LIB.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_clear_error.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_error_string.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_get_error.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_load_strings.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_print_errors.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_put_error.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_remove_state.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_BytesToKey.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_DigestInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_EncryptInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_OpenInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_PKEY_new.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_SealInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_SignInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_VerifyInit.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/OBJ_nid2obj.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/OPENSSL_config.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS12_create.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS12_parse.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS7_decrypt.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS7_encrypt.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS7_sign.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/PKCS7_verify.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_add.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_bytes.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_cleanup.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_egd.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_load_file.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_set_rand_method.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_blinding_on.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_check_key.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_generate_key.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_new.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_print.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_private_encrypt.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_public_encrypt.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_set_method.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_sign.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_size.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/X509_NAME_print_ex.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/X509_new.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bio.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/blowfish.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bn.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bn_internal.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/buffer.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/crypto.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_DHparams.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509_CRL.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509_NAME.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509_REQ.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_X509_SIG.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/des.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dh.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dsa.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/engine.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/err.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/evp.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/hmac.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/lh_stats.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/lhash.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/md5.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/mdc2.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/pem.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rand.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rc4.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ripemd.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rsa.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/sha.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/threads.3#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ui.3#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ui_compat.3#4 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#36 integrate .. //depot/projects/ia64/share/examples/pppd/ppp.deny.sample#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#68 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#18 integrate .. //depot/projects/ia64/share/man/man4/acpi_video.4#1 branch .. //depot/projects/ia64/share/man/man4/bfe.4#2 integrate .. //depot/projects/ia64/share/man/man4/de.4#3 integrate .. //depot/projects/ia64/share/man/man4/firewire.4#10 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#19 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_toshiba.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/asc.4#2 delete .. //depot/projects/ia64/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#6 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/gsc.4#4 delete .. //depot/projects/ia64/share/man/man4/man4.i386/le.4#2 delete .. //depot/projects/ia64/share/man/man4/man4.i386/rdp.4#4 delete .. //depot/projects/ia64/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/ia64/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_vlan.4#1 branch .. //depot/projects/ia64/share/man/man4/polling.4#8 integrate .. //depot/projects/ia64/share/man/man4/raid.4#5 delete .. //depot/projects/ia64/share/man/man4/re.4#4 integrate .. //depot/projects/ia64/share/man/man4/ste.4#4 integrate .. //depot/projects/ia64/share/man/man4/ubser.4#1 branch .. //depot/projects/ia64/share/man/man4/ubtbcmfw.4#4 integrate .. //depot/projects/ia64/share/man/man4/umct.4#1 branch .. //depot/projects/ia64/share/man/man4/uscanner.4#7 integrate .. //depot/projects/ia64/share/man/man5/Makefile#17 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#50 integrate .. //depot/projects/ia64/share/man/man7/environ.7#6 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_IDENTIFY.9#4 integrate .. //depot/projects/ia64/share/man/man9/Makefile#40 integrate .. //depot/projects/ia64/share/man/man9/bus_alloc_resource.9#6 integrate .. //depot/projects/ia64/share/man/man9/condvar.9#4 integrate .. //depot/projects/ia64/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/ia64/share/man/man9/g_access.9#1 branch .. //depot/projects/ia64/share/man/man9/g_attach.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_bio.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_data.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_event.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_geom.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_provider.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/ia64/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/ia64/share/man/man9/ieee80211.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/ia64/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/ia64/share/man/man9/malloc.9#15 integrate .. //depot/projects/ia64/share/man/man9/pfil.9#5 integrate .. //depot/projects/ia64/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/ia64/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/ia64/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/ia64/share/man/man9/vslock.9#4 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#16 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#19 integrate .. //depot/projects/ia64/share/mk/bsd.dep.mk#14 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#29 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#24 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#14 integrate .. //depot/projects/ia64/share/syscons/keymaps/ru.koi8-r.win.kbd#1 branch .. //depot/projects/ia64/share/termcap/termcap.src#18 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#20 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#41 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#45 integrate .. //depot/projects/ia64/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#29 integrate .. //depot/projects/ia64/sys/alpha/include/_types.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/critical.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/alpha/isa/isa.c#7 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#8 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#7 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#19 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/critical.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#21 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/ia64/sys/amd64/include/_types.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/critical.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/ia64/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/ia64/sys/amd64/isa/isa.c#4 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/ia64/sys/arm/include/_types.h#3 integrate .. //depot/projects/ia64/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/ia64/sys/boot/common/load_elf.c#14 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efi_console.c#5 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#19 integrate .. //depot/projects/ia64/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/ia64/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#18 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#32 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#16 integrate .. //depot/projects/ia64/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/ia64/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/ia64/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/ia64/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/ia64/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#25 integrate .. //depot/projects/ia64/sys/conf/NOTES#75 integrate .. //depot/projects/ia64/sys/conf/files#112 integrate .. //depot/projects/ia64/sys/conf/files.alpha#26 integrate .. //depot/projects/ia64/sys/conf/files.amd64#16 integrate .. //depot/projects/ia64/sys/conf/files.i386#53 integrate .. //depot/projects/ia64/sys/conf/files.ia64#53 integrate .. //depot/projects/ia64/sys/conf/files.pc98#43 integrate .. //depot/projects/ia64/sys/conf/kern.mk#11 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#41 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#27 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#32 integrate .. //depot/projects/ia64/sys/conf/options#72 integrate .. //depot/projects/ia64/sys/conf/options.amd64#7 integrate .. //depot/projects/ia64/sys/conf/options.i386#27 integrate .. //depot/projects/ia64/sys/conf/options.pc98#25 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl2.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/excreate.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmutex.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psscope.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#10 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#16 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#36 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#26 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#49 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#21 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#10 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#22 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#25 integrate .. //depot/projects/ia64/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/aha/aha_isa.c#7 integrate .. //depot/projects/ia64/sys/dev/aha/aha_mca.c#7 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#10 integrate .. //depot/projects/ia64/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/ia64/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/aic/aic_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.c#6 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#11 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#29 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.c#13 integrate .. //depot/projects/ia64/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/ia64/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/ia64/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/ia64/sys/dev/asr/asr.c#22 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#10 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#31 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#37 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#21 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#38 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#21 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#20 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/awi/awi.c#15 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#11 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#47 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#19 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#7 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#6 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#19 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#31 integrate .. //depot/projects/ia64/sys/dev/cm/smc90cx6.c#11 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#12 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs.c#8 integrate .. //depot/projects/ia64/sys/dev/ct/bshw_machdep.c#4 integrate .. //depot/projects/ia64/sys/dev/ct/ct.c#5 integrate .. //depot/projects/ia64/sys/dev/ct/ct_isa.c#7 integrate .. //depot/projects/ia64/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/ia64/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/ia64/sys/dev/digi/digi_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#13 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drv.h#15 integrate .. //depot/projects/ia64/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#14 integrate .. //depot/projects/ia64/sys/dev/drm/drm_vm.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#16 integrate .. //depot/projects/ia64/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#33 integrate .. //depot/projects/ia64/sys/dev/en/if_en_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#24 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#15 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#8 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex.c#9 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#12 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 20 18:27:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D45616A4D0; Sat, 20 Mar 2004 18:27:30 -0800 (PST) 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 F3EF116A4CE for ; Sat, 20 Mar 2004 18:27:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8E0643D2F for ; Sat, 20 Mar 2004 18:27:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L2RTGe015599 for ; Sat, 20 Mar 2004 18:27:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L2RTlj015571 for perforce@freebsd.org; Sat, 20 Mar 2004 18:27:29 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 18:27:29 -0800 (PST) Message-Id: <200403210227.i2L2RTlj015571@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 Subject: PERFORCE change 49425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 02:27:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=49425 Change 49425 by marcel@marcel_nfs on 2004/03/20 18:27:05 IFC @49421 Affected files ... .. //depot/projects/gdb/contrib/sort/Makefile#2 delete .. //depot/projects/gdb/contrib/sort/append.c#2 delete .. //depot/projects/gdb/contrib/sort/extern.h#2 delete .. //depot/projects/gdb/contrib/sort/fields.c#2 delete .. //depot/projects/gdb/contrib/sort/files.c#2 delete .. //depot/projects/gdb/contrib/sort/fsort.c#2 delete .. //depot/projects/gdb/contrib/sort/fsort.h#2 delete .. //depot/projects/gdb/contrib/sort/init.c#2 delete .. //depot/projects/gdb/contrib/sort/msort.c#2 delete .. //depot/projects/gdb/contrib/sort/pathnames.h#2 delete .. //depot/projects/gdb/contrib/sort/regress/Makefile#2 delete .. //depot/projects/gdb/contrib/sort/regress/stests#2 delete .. //depot/projects/gdb/contrib/sort/sort.1#2 delete .. //depot/projects/gdb/contrib/sort/sort.c#2 delete .. //depot/projects/gdb/contrib/sort/sort.h#2 delete .. //depot/projects/gdb/contrib/sort/tmp.c#2 delete .. //depot/projects/gdb/lib/csu/amd64/crti.S#2 integrate .. //depot/projects/gdb/lib/csu/amd64/crtn.S#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/debug.h#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/gdb/libexec/rtld-elf/libmap.h#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/gdb/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/gdb/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/gdb/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/gdb/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/gdb/sys/ia64/include/cpufunc.h#2 integrate Differences ... ==== //depot/projects/gdb/lib/csu/amd64/crti.S#2 (text+ko) ==== @@ -28,12 +28,14 @@ .globl _init .type _init,@function _init: + subq $8,%rsp .section .fini,"ax",@progbits .align 4 .globl _fini .type _fini,@function _fini: + subq $8,%rsp .section .rodata -.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.7 2004/03/21 01:39:01 peter Exp $\0" ==== //depot/projects/gdb/lib/csu/amd64/crtn.S#2 (text+ko) ==== @@ -24,10 +24,12 @@ */ .section .init,"ax",@progbits + addq $8,%rsp ret .section .fini,"ax",@progbits + addq $8,%rsp ret .section .rodata -.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.6 2004/03/21 01:39:01 peter Exp $\0" ==== //depot/projects/gdb/libexec/rtld-elf/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.25 2003/09/13 21:50:35 mdodd Exp $ +# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.26 2004/03/21 01:21:26 peter Exp $ -PROG= ld-elf.so.1 +PROG?= ld-elf.so.1 SRCS= rtld_start.S rtld.c rtld_lock.c map_object.c malloc.c \ xmalloc.c debug.c reloc.c libmap.c MAN= rtld.1 ==== //depot/projects/gdb/libexec/rtld-elf/amd64/rtld_start.S#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/amd64/rtld_start.S,v 1.4 2003/05/24 17:37:51 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $ */ .text @@ -31,14 +31,13 @@ .type .rtld_start,@function .rtld_start: xorq %rbp,%rbp # Clear frame pointer for good form - subq $16,%rsp # A place to store exit procedure addr + subq $24,%rsp # A place to store exit procedure addr movq %rdi,%r12 movq %rsp,%rsi # save address of exit proc movq %rsp,%rdx # construct address of obj_main addq $8,%rdx call _rtld@PLT # Call rtld(sp); returns entry point popq %rsi # Get exit procedure address - addq $8,%rsp # Ignore obj_main movq %r12,%rdi # *ap /* * At this point, %rax contains the entry point of the main program, and @@ -62,8 +61,9 @@ * assembly-language code that is not ABI-compliant. * * Stack map: - * reloff 0x58 - * obj 0x50 + * reloff 0x60 + * obj 0x58 + * spare 0x50 * rflags 0x48 * rax 0x40 * rdx 0x38 @@ -79,6 +79,7 @@ .globl _rtld_bind_start .type _rtld_bind_start,@function _rtld_bind_start: + subq $8,%rsp pushfq # Save rflags pushq %rax # Save %rax pushq %rdx # Save %rdx @@ -90,15 +91,15 @@ pushq %r10 # Save %r10 pushq %r11 # Save %r11 - movq 0x50(%rsp),%rdi # Fetch obj argument - movq 0x58(%rsp),%rsi # Fetch reloff argument + movq 0x58(%rsp),%rdi # Fetch obj argument + movq 0x60(%rsp),%rsi # Fetch reloff argument leaq (%rsi,%rsi,2),%rsi # multiply by 3 leaq (,%rsi,8),%rsi # now 8, for 24 (sizeof Elf_Rela) call _rtld_bind@PLT # Transfer control to the binder /* Now %rax contains the entry point of the function being called. */ - movq %rax,0x58(%rsp) # Store target over reloff argument + movq %rax,0x60(%rsp) # Store target over reloff argument popq %r11 # Restore %r11 popq %r10 # Restore %r10 popq %r9 # Restore %r9 @@ -109,5 +110,5 @@ popq %rdx # Restore %rdx popq %rax # Restore %rax popfq # Restore rflags - leaq 8(%rsp),%rsp # Discard obj, do not change rflags + leaq 16(%rsp),%rsp # Discard spare, obj, do not change rflags ret # "Return" to target address ==== //depot/projects/gdb/libexec/rtld-elf/debug.h#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/debug.h,v 1.5 2001/07/26 11:02:32 sheldonh Exp $ + * $FreeBSD: src/libexec/rtld-elf/debug.h,v 1.6 2004/03/21 01:21:26 peter Exp $ */ /* @@ -50,10 +50,17 @@ #define dbg(format, args...) ((void) 0) #endif +#ifndef COMPAT_32BIT +#define _MYNAME "ld-elf.so.1" +#else +#define _MYNAME "ld-elf32.so.1" +#endif + #define assert(cond) ((cond) ? (void) 0 : \ - (msg("ld-elf.so.1: assert failed: " __FILE__ ":" \ + (msg(_MYNAME ": assert failed: " __FILE__ ":" \ __XSTRING(__LINE__) "\n"), abort())) #define msg(s) write(STDOUT_FILENO, s, strlen(s)) -#define trace() msg("ld-elf.so.1: " __XSTRING(__LINE__) "\n") +#define trace() msg(_MYNAME ": " __XSTRING(__LINE__) "\n") + #endif /* DEBUG_H */ ==== //depot/projects/gdb/libexec/rtld-elf/libmap.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.10 2004/02/03 18:53:40 fjoe Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.11 2004/03/21 01:21:26 peter Exp $ */ #include @@ -17,6 +17,11 @@ #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #endif +#ifdef COMPAT_32BIT +#undef _PATH_LIBMAP_CONF +#define _PATH_LIBMAP_CONF "/etc/libmap32.conf" +#endif + TAILQ_HEAD(lm_list, lm); struct lm { char *f; @@ -211,6 +216,27 @@ return (NULL); } +#ifdef COMPAT_32BIT +char * +lm_findn (const char *p, const char *f, const int n) +{ + char pathbuf[64], *s, *t; + + if (n < sizeof(pathbuf) - 1) { + memcpy(pathbuf, f, n); + pathbuf[n] = '\0'; + s = pathbuf; + } else { + s = xmalloc(n + 1); + strcpy(s, f); + } + t = lm_find(p, s); + if (s != pathbuf) + free(s); + return (t); +} +#endif + static char * lml_find (struct lm_list *lmh, const char *f) { @@ -219,8 +245,7 @@ dbg("%s(%p, \"%s\")", __func__, lmh, f); TAILQ_FOREACH(lm, lmh, lm_link) - if ((strncmp(f, lm->f, strlen(lm->f)) == 0) && - (strlen(f) == strlen(lm->f))) + if (strcmp(f, lm->f) == 0) return (lm->t); return NULL; } @@ -233,8 +258,7 @@ dbg("%s(\"%s\")", __func__, n); TAILQ_FOREACH(lmp, &lmp_head, lmp_link) - if ((strncmp(n, lmp->p, strlen(lmp->p)) == 0) && - (strlen(n) == strlen(lmp->p))) + if (strcmp(n, lmp->p) == 0) return (&lmp->lml); return (NULL); } ==== //depot/projects/gdb/libexec/rtld-elf/libmap.h#2 (text+ko) ==== @@ -1,7 +1,10 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.h,v 1.2 2003/09/13 21:43:08 mdodd Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.h,v 1.3 2004/03/21 01:21:26 peter Exp $ */ int lm_init (void); void lm_fini (void); char * lm_find (const char *, const char *); +#ifdef COMPAT_32BIT +char * lm_findn (const char *, const char *, const int); +#endif ==== //depot/projects/gdb/libexec/rtld-elf/rtld.c#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/libexec/rtld-elf/rtld.c,v 1.93 2004/03/05 08:10:18 markm Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.94 2004/03/21 01:21:26 peter Exp $ */ /* @@ -54,7 +54,11 @@ #include "rtld.h" #include "libmap.h" +#ifndef COMPAT_32BIT #define PATH_RTLD "/libexec/ld-elf.so.1" +#else +#define PATH_RTLD "/libexec/ld-elf32.so.1" +#endif /* Types. */ typedef void (*func_ptr_type)(); @@ -261,14 +265,14 @@ trust = !issetugid(); - ld_bind_now = getenv("LD_BIND_NOW"); + ld_bind_now = getenv(LD_ "BIND_NOW"); if (trust) { - ld_debug = getenv("LD_DEBUG"); - libmap_disable = getenv("LD_LIBMAP_DISABLE") != NULL; - ld_library_path = getenv("LD_LIBRARY_PATH"); - ld_preload = getenv("LD_PRELOAD"); + ld_debug = getenv(LD_ "DEBUG"); + libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL; + ld_library_path = getenv(LD_ "LIBRARY_PATH"); + ld_preload = getenv(LD_ "PRELOAD"); } - ld_tracing = getenv("LD_TRACE_LOADED_OBJECTS"); + ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS"); if (ld_debug != NULL && *ld_debug != '\0') debug = 1; @@ -360,7 +364,7 @@ exit(0); } - if (getenv("LD_DUMP_REL_PRE") != NULL) { + if (getenv(LD_ "DUMP_REL_PRE") != NULL) { dump_relocations(obj_main); exit (0); } @@ -373,7 +377,7 @@ if (do_copy_relocations(obj_main) == -1) die(); - if (getenv("LD_DUMP_REL_POST") != NULL) { + if (getenv(LD_ "DUMP_REL_POST") != NULL) { dump_relocations(obj_main); exit (0); } @@ -1460,6 +1464,9 @@ static void * path_enumerate(const char *path, path_enum_proc callback, void *arg) { +#ifdef COMPAT_32BIT + const char *trans; +#endif if (path == NULL) return (NULL); @@ -1469,6 +1476,12 @@ char *res; len = strcspn(path, ":;"); +#ifdef COMPAT_32BIT + trans = lm_findn(NULL, path, len); + if (trans) + res = callback(trans, strlen(trans), arg); + else +#endif res = callback(path, len, arg); if (res != NULL) @@ -2259,16 +2272,16 @@ char *fmt1, *fmt2, *fmt, *main_local, *list_containers; int c; - if ((main_local = getenv("LD_TRACE_LOADED_OBJECTS_PROGNAME")) == NULL) + if ((main_local = getenv(LD_ "TRACE_LOADED_OBJECTS_PROGNAME")) == NULL) main_local = ""; - if ((fmt1 = getenv("LD_TRACE_LOADED_OBJECTS_FMT1")) == NULL) + if ((fmt1 = getenv(LD_ "TRACE_LOADED_OBJECTS_FMT1")) == NULL) fmt1 = "\t%o => %p (%x)\n"; - if ((fmt2 = getenv("LD_TRACE_LOADED_OBJECTS_FMT2")) == NULL) + if ((fmt2 = getenv(LD_ "TRACE_LOADED_OBJECTS_FMT2")) == NULL) fmt2 = "\t%o (%x)\n"; - list_containers = getenv("LD_TRACE_LOADED_OBJECTS_ALL"); + list_containers = getenv(LD_ "TRACE_LOADED_OBJECTS_ALL"); for (; obj; obj = obj->next) { Needed_Entry *needed; ==== //depot/projects/gdb/libexec/rtld-elf/rtld.h#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/rtld.h,v 1.32 2003/08/17 07:55:17 gordon Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.33 2004/03/21 01:21:26 peter Exp $ */ #ifndef RTLD_H /* { */ @@ -39,9 +39,21 @@ #include "rtld_lock.h" #include "rtld_machdep.h" +#ifdef COMPAT_32BIT +#undef STANDARD_LIBRARY_PATH +#undef _PATH_ELF_HINTS +#define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" +/* For running 32 bit binaries */ +#define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" +#define LD_ "LD_32_" +#endif + #ifndef STANDARD_LIBRARY_PATH #define STANDARD_LIBRARY_PATH "/lib:/usr/lib" #endif +#ifndef LD_ +#define LD_ "LD_" +#endif #define NEW(type) ((type *) xmalloc(sizeof(type))) #define CNEW(type) ((type *) xcalloc(sizeof(type))) ==== //depot/projects/gdb/sbin/ldconfig/ldconfig.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.39 2004/03/13 00:11:05 cperciva Exp $"; + "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.40 2004/03/21 01:21:26 peter Exp $"; #endif /* not lint */ #include @@ -63,6 +63,9 @@ #define _PATH_ELF_HINTS "./ld-elf.so.hints" #endif +#define _PATH_LD32_HINTS "/var/run/ld32.so.hints" +#define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" + #undef major #undef minor @@ -102,20 +105,31 @@ { int i, c; int rval = 0; - int is_aout; + int is_aout = 0; + int is_32 = 0; - is_aout = 0; - if (argc > 1 && strcmp(argv[1], "-aout") == 0) { - is_aout = 1; - argc--; - argv++; - } else if (argc > 1 && strcmp(argv[1], "-elf") == 0) { - /* skip over legacy -elf arg */ - argc--; - argv++; + while (argc > 1) { + if (strcmp(argv[1], "-aout") == 0) { + is_aout = 1; + argc--; + argv++; + } else if (strcmp(argv[1], "-elf") == 0) { + is_aout = 0; + argc--; + argv++; + } else if (strcmp(argv[1], "-32") == 0) { + is_32 = 1; + argc--; + argv++; + } else { + break; + } } - hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; + if (is_32) + hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS; + else + hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; if (argc == 1) rescan = 1; else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) { ==== //depot/projects/gdb/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.16 2004/02/04 21:52:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.17 2004/03/21 01:22:24 peter Exp $"); #include "opt_compat.h" @@ -136,7 +136,7 @@ NULL, "/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, - "/libexec/ld-elf-32.so.1", + "/libexec/ld-elf32.so.1", }; SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -150,7 +150,7 @@ NULL, "/usr/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, - "/usr/libexec/ld-elf-32.so.1", + "/usr/libexec/ld-elf32.so.1", }; SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.42 2004/03/11 09:50:00 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.43 2004/03/20 23:39:43 wpaul Exp $"); #include #include @@ -1152,7 +1152,6 @@ ndis_handle adapter; __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; - struct ndis_timer_entry *ne; sc = arg; ifp = &sc->arpcom.ac_if; @@ -1178,14 +1177,6 @@ NDIS_LOCK(sc); sc->ndis_block.nmb_miniportadapterctx = NULL; NDIS_UNLOCK(sc); - /* Clobber all the timers in case the driver left one running. */ - - while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { - ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); - TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); - callout_stop(&ne->nte_ch); - free(ne, M_DEVBUF); - } return(0); } ==== //depot/projects/gdb/sys/compat/ndis/ndis_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.21 2004/02/14 20:57:32 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.22 2004/03/20 23:39:43 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -835,7 +835,7 @@ }; struct ndis_event { - struct ndis_kevent ne_event; + struct nt_kevent ne_event; }; typedef struct ndis_event ndis_event; @@ -858,8 +858,8 @@ }; struct ndis_timer { - struct ndis_ktimer nt_timer; - struct ndis_kdpc nt_dpc; + struct ktimer nt_ktimer; + struct kdpc nt_kdpc; }; typedef struct ndis_timer ndis_timer; @@ -867,10 +867,11 @@ typedef void (*ndis_timer_function)(void *, void *, void *, void *); struct ndis_miniport_timer { - struct ndis_ktimer nmt_ktimer; - struct ndis_kdpc nmt_dpc; + struct ktimer nmt_ktimer; + struct kdpc nmt_kdpc; ndis_timer_function nmt_timerfunc; void *nmt_timerctx; + ndis_miniport_block *nmt_block; struct ndis_miniport_timer *nmt_nexttimer; }; ==== //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.9 2004/03/04 23:04:02 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.10 2004/03/20 23:39:43 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -472,7 +472,21 @@ __BEGIN_DECLS extern int ntoskrnl_libinit(void); extern int ntoskrnl_libfini(void); -extern void ntoskrnl_wakeup(void *); +__stdcall extern void ntoskrnl_init_dpc(kdpc *, void *, void *); +__stdcall extern void ntoskrnl_init_timer(ktimer *); +__stdcall extern void ntoskrnl_init_timer_ex(ktimer *, uint32_t); +__stdcall extern uint8_t ntoskrnl_set_timer(ktimer *, int64_t, kdpc *); +__stdcall extern uint8_t ntoskrnl_set_timer_ex(ktimer *, int64_t, + uint32_t, kdpc *); +__stdcall extern uint8_t ntoskrnl_cancel_timer(ktimer *); +__stdcall extern uint8_t ntoskrnl_read_timer(ktimer *); +__stdcall uint32_t ntoskrnl_waitforobj(nt_dispatch_header *, uint32_t, + uint32_t, uint8_t, int64_t *); +__stdcall void ntoskrnl_init_event(nt_kevent *, uint32_t, uint8_t); +__stdcall void ntoskrnl_clear_event(nt_kevent *); +__stdcall uint32_t ntoskrnl_read_event(nt_kevent *); +__stdcall uint32_t ntoskrnl_set_event(nt_kevent *, uint32_t, uint8_t); +__stdcall uint32_t ntoskrnl_reset_event(nt_kevent *); __END_DECLS #endif /* _NTOSKRNL_VAR_H_ */ ==== //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.51 2004/03/11 09:40:00 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.52 2004/03/20 23:39:43 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -148,15 +148,13 @@ __stdcall static void ndis_vtophys_load(ndis_handle, ndis_buffer *, uint32_t, uint8_t, ndis_paddr_unit *, uint32_t *); __stdcall static void ndis_vtophys_unload(ndis_handle, ndis_buffer *, uint32_t); -__stdcall static void ndis_create_timer(ndis_miniport_timer *, ndis_handle *, +__stdcall static void ndis_create_timer(ndis_miniport_timer *, ndis_handle, ndis_timer_function, void *); __stdcall static void ndis_init_timer(ndis_timer *, ndis_timer_function, void *); -static void ndis_timercall(void *); -__stdcall static void ndis_set_timer(ndis_miniport_timer *, uint32_t); -static void ndis_tick(void *); +__stdcall static void ndis_set_timer(ndis_timer *, uint32_t); __stdcall static void ndis_set_periodic_timer(ndis_miniport_timer *, uint32_t); -__stdcall static void ndis_cancel_timer(ndis_miniport_timer *, uint8_t *); +__stdcall static void ndis_cancel_timer(ndis_timer *, uint8_t *); __stdcall static void ndis_query_resources(ndis_status *, ndis_handle, ndis_resource_list *, uint32_t *); __stdcall static ndis_status ndis_register_ioport(void **, @@ -521,6 +519,7 @@ { uint16_t *unicode; ndis_unicode_string *ustr; + int base = 0; unicode = (uint16_t *)&block->nmb_dummybuf; @@ -533,14 +532,22 @@ ustr->nus_buf = unicode; break; case ndis_parm_int: + if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) + base = 16; + else + base = 10; (*parm)->ncp_type = ndis_parm_int; (*parm)->ncp_parmdata.ncp_intdata = - strtol((char *)oid->oid_arg1, NULL, 10); + strtol((char *)oid->oid_arg1, NULL, base); break; case ndis_parm_hexint: + if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) + base = 16; + else + base = 10; (*parm)->ncp_type = ndis_parm_hexint; (*parm)->ncp_parmdata.ncp_intdata = - strtoul((char *)oid->oid_arg1, NULL, 16); + strtoul((char *)oid->oid_arg1, NULL, base); break; default: return(NDIS_STATUS_FAILURE); @@ -936,166 +943,74 @@ ndis_timer_function func; void *ctx; { - struct ndis_timer_entry *ne = NULL; - ndis_miniport_block *block = NULL; + ntoskrnl_init_timer(&timer->nt_ktimer); + ntoskrnl_init_dpc(&timer->nt_kdpc, func, ctx); - TAILQ_FOREACH(block, &ndis_devhead, link) { - if (block->nmb_miniportadapterctx == ctx) - break; - } - - if (block->nmb_miniportadapterctx != ctx) - panic("NDIS driver timer context didn't " - "match any adapter contexts"); - - ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_init(&ne->nte_ch, CALLOUT_MPSAFE); - TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); - ne->nte_timer = (ndis_miniport_timer *)timer; - - INIT_LIST_HEAD((&timer->nt_timer.nk_header.dh_waitlisthead)); - timer->nt_timer.nk_header.dh_sigstate = FALSE; - timer->nt_timer.nk_header.dh_type = EVENT_TYPE_NOTIFY; - timer->nt_timer.nk_header.dh_size = OTYPE_TIMER; - timer->nt_dpc.nk_sysarg1 = &ne->nte_ch; - timer->nt_dpc.nk_deferedfunc = (ndis_kdpc_func)func; - timer->nt_dpc.nk_deferredctx = ctx; - return; } __stdcall static void ndis_create_timer(timer, handle, func, ctx) ndis_miniport_timer *timer; - ndis_handle *handle; + ndis_handle handle; ndis_timer_function func; void *ctx; { - struct ndis_timer_entry *ne = NULL; - ndis_miniport_block *block; - block = (ndis_miniport_block *)handle; + /* Save the funcptr and context */ - ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_init(&ne->nte_ch, CALLOUT_MPSAFE); - TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); - ne->nte_timer = timer; + timer->nmt_timerfunc = func; + timer->nmt_timerctx = ctx; + timer->nmt_block = handle; - INIT_LIST_HEAD((&timer->nmt_ktimer.nk_header.dh_waitlisthead)); - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - timer->nmt_ktimer.nk_header.dh_type = EVENT_TYPE_NOTIFY; - timer->nmt_ktimer.nk_header.dh_size = OTYPE_TIMER; - timer->nmt_dpc.nk_sysarg1 = &ne->nte_ch; - timer->nmt_dpc.nk_deferedfunc = (ndis_kdpc_func)func; - timer->nmt_dpc.nk_deferredctx = ctx; + ntoskrnl_init_timer(&timer->nmt_ktimer); + ntoskrnl_init_dpc(&timer->nmt_kdpc, func, ctx); return; } /* - * The driver's timer callout is __stdcall function, so we need this - * intermediate step. - */ - -static void -ndis_timercall(arg) - void *arg; -{ - ndis_miniport_timer *timer; - __stdcall ndis_timer_function timerfunc; - - timer = arg; - - timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; - timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); - ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); - - return; -} - -/* - * Windows specifies timeouts in milliseconds. We specify timeouts - * in hz, so some conversion is required. + * In Windows, there's both an NdisMSetTimer() and an NdisSetTimer(), + * but the former is just a macro wrapper around the latter. */ __stdcall static void ndis_set_timer(timer, msecs) - ndis_miniport_timer *timer; + ndis_timer *timer; uint32_t msecs; { - struct callout *ch; - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_dpc.nk_sysarg2 = ndis_timercall; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); + /* + * KeSetTimer() wants the period in + * hundred nanosecond intervals. + */ + ntoskrnl_set_timer(&timer->nt_ktimer, + ((int64_t)msecs * -10000), &timer->nt_kdpc); return; } -static void -ndis_tick(arg) - void *arg; -{ - ndis_miniport_timer *timer; - struct callout *ch; - __stdcall ndis_timer_function timerfunc; - struct timeval tv; - - timer = arg; - - /* Automatically reload timer. */ - - tv.tv_sec = 0; - tv.tv_usec = timer->nmt_ktimer.nk_period * 1000; - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - timer->nmt_dpc.nk_sysarg2 = ndis_tick; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); - - timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; - timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); - ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); - - return; -} - __stdcall static void ndis_set_periodic_timer(timer, msecs) ndis_miniport_timer *timer; uint32_t msecs; { - struct callout *ch; - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - timer->nmt_ktimer.nk_period = msecs; - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_dpc.nk_sysarg2 = ndis_tick; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); + ntoskrnl_set_timer_ex(&timer->nmt_ktimer, + ((int64_t)msecs * -10000), msecs, &timer->nmt_kdpc); return; } +/* + * Technically, this is really NdisCancelTimer(), but we also + * (ab)use it for NdisMCancelTimer(), since in our implementation + * we don't need the extra info in the ndis_miniport_timer + * structure. + */ + __stdcall static void ndis_cancel_timer(timer, cancelled) - ndis_miniport_timer *timer; + ndis_timer *timer; uint8_t *cancelled; { - struct callout *ch; - - if (timer == NULL) - return; - ch = timer->nmt_dpc.nk_sysarg1; - if (ch == NULL) - return; - callout_stop(ch); - *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; + *cancelled = ntoskrnl_cancel_timer(&timer->nt_ktimer); return; } @@ -1990,10 +1905,13 @@ ndis_init_event(event) ndis_event *event; { - event->ne_event.nk_header.dh_sigstate = FALSE; - event->ne_event.nk_header.dh_size = OTYPE_EVENT; - event->ne_event.nk_header.dh_type = EVENT_TYPE_NOTIFY; - INIT_LIST_HEAD((&event->ne_event.nk_header.dh_waitlisthead)); + /* + * NDIS events are always synchronization + * events, and should be initialized to the + * not signaled state. + */ + + ntoskrnl_init_event(&event->ne_event, EVENT_TYPE_SYNC, FALSE); return; } @@ -2001,7 +1919,7 @@ ndis_set_event(event) ndis_event *event; { - ntoskrnl_wakeup(event); + ntoskrnl_set_event(&event->ne_event, 0, 0); return; } @@ -2009,56 +1927,27 @@ ndis_reset_event(event) ndis_event *event; { - event->ne_event.nk_header.dh_sigstate = FALSE; + ntoskrnl_reset_event(&event->ne_event); return; } -/* - * This is a stripped-down version of KeWaitForSingleObject(). - * Maybe it ought to just call ntoskrnl_waitforobj() to reduce - * code duplication. - */ - __stdcall static uint8_t ndis_wait_event(event, msecs) ndis_event *event; uint32_t msecs; { - int error; - struct timeval tv; - wait_block w; - struct thread *td = curthread; + int64_t duetime; + uint32_t rval; - mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); + duetime = ((int64_t)msecs * -10000); - if (event->ne_event.nk_header.dh_sigstate == TRUE) { - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - return(TRUE); - } + rval = ntoskrnl_waitforobj((nt_dispatch_header *)event, + 0, 0, TRUE, msecs ? &duetime : NULL); - INSERT_LIST_TAIL((&event->ne_event.nk_header.dh_waitlisthead), - (&w.wb_waitlist)); + if (rval == STATUS_TIMEOUT) + return(FALSE); - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - w.wb_kthread = td; - w.wb_object = &event->ne_event.nk_header; - - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - - if (td->td_proc->p_flag & P_KTHREAD) - error = kthread_suspend(td->td_proc, tvtohz(&tv)); - else - error = tsleep(td, PPAUSE|PCATCH, "ndiswe", tvtohz(&tv)); - - mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); - - REMOVE_LIST_ENTRY((&w.wb_waitlist)); - - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - - return(event->ne_event.nk_header.dh_sigstate); + return(TRUE); } __stdcall static ndis_status ==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.28 2004/03/15 16:39:03 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.29 2004/03/20 23:39:43 wpaul Exp $"); #include #include @@ -81,25 +81,11 @@ void *, uint32_t, uint32_t *, void *, void *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 20 19:55:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEDA516A4D9; Sat, 20 Mar 2004 19:55:19 -0800 (PST) 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 B3E2316A4D7 for ; Sat, 20 Mar 2004 19:55:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 666DF43D4C for ; Sat, 20 Mar 2004 19:55:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L3tHGe045492 for ; Sat, 20 Mar 2004 19:55:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L3tG4h045488 for perforce@freebsd.org; Sat, 20 Mar 2004 19:55:16 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 19:55:16 -0800 (PST) Message-Id: <200403210355.i2L3tG4h045488@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 Subject: PERFORCE change 49427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 03:55:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=49427 Change 49427 by marcel@marcel_nfs on 2004/03/20 19:55:07 o Port the GDB backend to amd64. o Introduce gdb_cpu_trap() to give MD code a chance to do some necessary preparations (like flushing). o Fill in the real register values on sparc64. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/gdb_machdep.c#2 edit .. //depot/projects/gdb/sys/amd64/amd64/gdb_machdep.c#1 add .. //depot/projects/gdb/sys/amd64/include/gdb_machdep.h#1 add .. //depot/projects/gdb/sys/gdb/gdb.h#6 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#7 edit .. //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#3 edit .. //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#3 edit .. //depot/projects/gdb/sys/sparc64/include/gdb_machdep.h#2 edit .. //depot/projects/gdb/sys/sparc64/sparc64/gdb_machdep.c#2 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -80,30 +80,46 @@ } int -gdb_cpu_signal(int vector, int dummy) +gdb_cpu_signal(int entry, int code) { - - switch (vector) { - case 0: return (SIGFPE); /* Divide by zero. */ - case 1: return (SIGTRAP); /* Debug exception. */ - case 3: return (SIGTRAP); /* Breakpoint. */ - case 4: return (SIGURG); /* into instr. (overflow). */ - case 5: return (SIGURG); /* bound instruction. */ - case 6: return (SIGILL); /* Invalid opcode. */ - case 7: return (SIGFPE); /* Coprocessor not present. */ - case 8: return (SIGEMT); /* Double fault. */ - case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ - case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ - case 11: return (SIGSEGV); /* Segment not present. */ - case 12: return (SIGSEGV); /* Stack exception. */ - case 13: return (SIGSEGV); /* General protection. */ - case 14: return (SIGSEGV); /* Page fault. */ - case 16: return (SIGEMT); /* Coprocessor error. */ + switch (entry) { + case ALPHA_KENTRY_INT: + case ALPHA_KENTRY_ARITH: + return (SIGILL); /* Can this happen? */ + case ALPHA_KENTRY_MM: + switch (code) { + case ALPHA_MMCSR_INVALTRANS: + return (SIGSEGV); + case ALPHA_MMCSR_ACCESS: + case ALPHA_MMCSR_FOR: + case ALPHA_MMCSR_FOE: + case ALPHA_MMCSR_FOW: + return (SIGBUS); + } + case ALPHA_KENTRY_IF: + switch (code) { + case ALPHA_IF_CODE_BUGCHK: + case ALPHA_IF_CODE_BPT: + return (SIGTRAP); + case ALPHA_IF_CODE_GENTRAP: + case ALPHA_IF_CODE_FEN: + case ALPHA_IF_CODE_OPDEC: + return (SIGILL); + } + case ALPHA_KENTRY_UNA: + return (SIGSEGV); + case ALPHA_KENTRY_SYS: + return (SIGILL); } - return (SIGEMT); + return (SIGILL); } void gdb_cpu_singlestep(int on, struct trapframe *tf) { } + +void +gdb_cpu_trap(int entry, int code, struct trapframe *tf) +{ +} ==== //depot/projects/gdb/sys/gdb/gdb.h#6 (text+ko) ==== @@ -67,5 +67,6 @@ void gdb_cpu_setreg(int, struct trapframe *, uintmax_t); int gdb_cpu_signal(int, int); void gdb_cpu_singlestep(int, struct trapframe *); +void gdb_cpu_trap(int, int, struct trapframe *); #endif /* !_GDB_GDB_H_ */ ==== //depot/projects/gdb/sys/gdb/gdb_main.c#7 (text+ko) ==== @@ -99,6 +99,9 @@ tid_cont = -1; tid_gen = (p != NULL) ? p->p_pid : 0; + /* Give MD code a change to set things up. */ + gdb_cpu_trap(type, code, tf); + /* * Send a T packet. We currently do not support watchpoints (the * awatch, rwatch or watch elements). ==== //depot/projects/gdb/sys/i386/i386/gdb_machdep.c#3 (text+ko) ==== @@ -120,7 +120,11 @@ void gdb_cpu_singlestep(int on, struct trapframe *tf) { - tf->tf_eflags &= ~PSL_T; tf->tf_eflags |= (on) ? PSL_T : 0; } + +void +gdb_cpu_trap(int type, int code, struct trapframe *tf) +{ +} ==== //depot/projects/gdb/sys/ia64/ia64/gdb_machdep.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ case GDB_REG_FP: return (tf->tf_special.bspstore + tf->tf_special.ndirty); case GDB_REG_PC: - return (tf->tf_special.iip); + return (tf->tf_special.iip + ((tf->tf_special.psr >> 41) & 3)); case GDB_REG_SP: return (tf->tf_special.sp); } @@ -84,28 +84,18 @@ int gdb_cpu_signal(int vector, int dummy) { + return (vector); +} - switch (vector) { - case 0: return (SIGFPE); /* Divide by zero. */ - case 1: return (SIGTRAP); /* Debug exception. */ - case 3: return (SIGTRAP); /* Breakpoint. */ - case 4: return (SIGURG); /* into instr. (overflow). */ - case 5: return (SIGURG); /* bound instruction. */ - case 6: return (SIGILL); /* Invalid opcode. */ - case 7: return (SIGFPE); /* Coprocessor not present. */ - case 8: return (SIGEMT); /* Double fault. */ - case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ - case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ - case 11: return (SIGSEGV); /* Segment not present. */ - case 12: return (SIGSEGV); /* Stack exception. */ - case 13: return (SIGSEGV); /* General protection. */ - case 14: return (SIGSEGV); /* Page fault. */ - case 16: return (SIGEMT); /* Coprocessor error. */ - } - return (SIGEMT); +void +gdb_cpu_singlestep(int on, struct trapframe *tf) +{ } void -gdb_cpu_singlestep(int on, struct trapframe *tf) +gdb_cpu_trap(int vector, int dummy, struct trapframe *tf) { + __asm __volatile("flushrs;;"); + if (vector == IA64_VEC_BREAK && tf->tf_special.ifa == IA64_FIXED_BREAK) + tf->tf_special.psr += IA64_PSR_RI_1; } ==== //depot/projects/gdb/sys/sparc64/include/gdb_machdep.h#2 (text+ko) ==== @@ -31,8 +31,8 @@ #define GDB_BUFSZ 600 -#define GDB_REG_FP 328 -#define GDB_REG_PC 331 -#define GDB_REG_SP 12 +#define GDB_REG_FP 30 +#define GDB_REG_PC 80 +#define GDB_REG_SP 14 #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/sparc64/sparc64/gdb_machdep.c#2 (text+ko) ==== @@ -80,30 +80,20 @@ } int -gdb_cpu_signal(int vector, int dummy) +gdb_cpu_signal(int type, int dummy) { + return (type); +} - switch (vector) { - case 0: return (SIGFPE); /* Divide by zero. */ - case 1: return (SIGTRAP); /* Debug exception. */ - case 3: return (SIGTRAP); /* Breakpoint. */ - case 4: return (SIGURG); /* into instr. (overflow). */ - case 5: return (SIGURG); /* bound instruction. */ - case 6: return (SIGILL); /* Invalid opcode. */ - case 7: return (SIGFPE); /* Coprocessor not present. */ - case 8: return (SIGEMT); /* Double fault. */ - case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ - case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ - case 11: return (SIGSEGV); /* Segment not present. */ - case 12: return (SIGSEGV); /* Stack exception. */ - case 13: return (SIGSEGV); /* General protection. */ - case 14: return (SIGSEGV); /* Page fault. */ - case 16: return (SIGEMT); /* Coprocessor error. */ - } - return (SIGEMT); +void +gdb_cpu_singlestep(int on, struct trapframe *tf) +{ + /* XXX dunno. */ + TF_DONE(tf); } void -gdb_cpu_singlestep(int on, struct trapframe *tf) +gdb_cpu_trap(int type, int dummy, struct trapframe *tf) { + flushw(); } From owner-p4-projects@FreeBSD.ORG Sat Mar 20 20:18:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4E0216A4D0; Sat, 20 Mar 2004 20:18:46 -0800 (PST) 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 7C5DD16A4CE for ; Sat, 20 Mar 2004 20:18:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 705E143D31 for ; Sat, 20 Mar 2004 20:18:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L4IkGe050530 for ; Sat, 20 Mar 2004 20:18:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4IjAT050527 for perforce@freebsd.org; Sat, 20 Mar 2004 20:18:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Mar 2004 20:18:45 -0800 (PST) Message-Id: <200403210418.i2L4IjAT050527@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 Subject: PERFORCE change 49428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 04:18:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=49428 Change 49428 by rwatson@rwatson_paprika on 2004/03/20 20:18:38 Integrate: - Add cpu_mask_t. - rtld magic to improve 32-bit emulation on 64-bit platforms. - NDIS timer rewrite and other extensive NDIS evil. - uart driver speaks hints. - USB attach/detach event improvements. - Loop back at_control, ddp_output, ddp_pcb "(struct foo *)0"->"NULL". - if_xl checksum in hardware disabled by default for XL905B. - Add uiomove_fromphys(). Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/netperf_socket/sys/conf/files#11 integrate .. //depot/projects/netperf_socket/sys/conf/files.alpha#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#4 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#2 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#3 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/awi/awi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_subr.c#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/uio_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/ia64/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/tree.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/uio.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef float __float_t; ==== //depot/projects/netperf_socket/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,6 +55,7 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; typedef double __float_t; ==== //depot/projects/netperf_socket/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -63,6 +63,7 @@ * Standard type definitions. */ typedef __uint32_t __clock_t; /* clock()... */ +typedef unsigned int __cpumask_t; typedef __int32_t __critical_t; typedef __int32_t __intfptr_t; typedef __int64_t __intmax_t; ==== //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.16 2004/02/04 21:52:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.17 2004/03/21 01:22:24 peter Exp $"); #include "opt_compat.h" @@ -136,7 +136,7 @@ NULL, "/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, - "/libexec/ld-elf-32.so.1", + "/libexec/ld-elf32.so.1", }; SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -150,7 +150,7 @@ NULL, "/usr/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, - "/usr/libexec/ld-elf-32.so.1", + "/usr/libexec/ld-elf32.so.1", }; SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.42 2004/03/11 09:50:00 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.43 2004/03/20 23:39:43 wpaul Exp $"); #include #include @@ -1152,7 +1152,6 @@ ndis_handle adapter; __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; - struct ndis_timer_entry *ne; sc = arg; ifp = &sc->arpcom.ac_if; @@ -1178,14 +1177,6 @@ NDIS_LOCK(sc); sc->ndis_block.nmb_miniportadapterctx = NULL; NDIS_UNLOCK(sc); - /* Clobber all the timers in case the driver left one running. */ - - while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { - ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); - TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); - callout_stop(&ne->nte_ch); - free(ne, M_DEVBUF); - } return(0); } ==== //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.21 2004/02/14 20:57:32 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.22 2004/03/20 23:39:43 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -835,7 +835,7 @@ }; struct ndis_event { - struct ndis_kevent ne_event; + struct nt_kevent ne_event; }; typedef struct ndis_event ndis_event; @@ -858,8 +858,8 @@ }; struct ndis_timer { - struct ndis_ktimer nt_timer; - struct ndis_kdpc nt_dpc; + struct ktimer nt_ktimer; + struct kdpc nt_kdpc; }; typedef struct ndis_timer ndis_timer; @@ -867,10 +867,11 @@ typedef void (*ndis_timer_function)(void *, void *, void *, void *); struct ndis_miniport_timer { - struct ndis_ktimer nmt_ktimer; - struct ndis_kdpc nmt_dpc; + struct ktimer nmt_ktimer; + struct kdpc nmt_kdpc; ndis_timer_function nmt_timerfunc; void *nmt_timerctx; + ndis_miniport_block *nmt_block; struct ndis_miniport_timer *nmt_nexttimer; }; ==== //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.9 2004/03/04 23:04:02 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.10 2004/03/20 23:39:43 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -472,7 +472,21 @@ __BEGIN_DECLS extern int ntoskrnl_libinit(void); extern int ntoskrnl_libfini(void); -extern void ntoskrnl_wakeup(void *); +__stdcall extern void ntoskrnl_init_dpc(kdpc *, void *, void *); +__stdcall extern void ntoskrnl_init_timer(ktimer *); +__stdcall extern void ntoskrnl_init_timer_ex(ktimer *, uint32_t); +__stdcall extern uint8_t ntoskrnl_set_timer(ktimer *, int64_t, kdpc *); +__stdcall extern uint8_t ntoskrnl_set_timer_ex(ktimer *, int64_t, + uint32_t, kdpc *); +__stdcall extern uint8_t ntoskrnl_cancel_timer(ktimer *); +__stdcall extern uint8_t ntoskrnl_read_timer(ktimer *); +__stdcall uint32_t ntoskrnl_waitforobj(nt_dispatch_header *, uint32_t, + uint32_t, uint8_t, int64_t *); +__stdcall void ntoskrnl_init_event(nt_kevent *, uint32_t, uint8_t); +__stdcall void ntoskrnl_clear_event(nt_kevent *); +__stdcall uint32_t ntoskrnl_read_event(nt_kevent *); +__stdcall uint32_t ntoskrnl_set_event(nt_kevent *, uint32_t, uint8_t); +__stdcall uint32_t ntoskrnl_reset_event(nt_kevent *); __END_DECLS #endif /* _NTOSKRNL_VAR_H_ */ ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.51 2004/03/11 09:40:00 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.52 2004/03/20 23:39:43 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -148,15 +148,13 @@ __stdcall static void ndis_vtophys_load(ndis_handle, ndis_buffer *, uint32_t, uint8_t, ndis_paddr_unit *, uint32_t *); __stdcall static void ndis_vtophys_unload(ndis_handle, ndis_buffer *, uint32_t); -__stdcall static void ndis_create_timer(ndis_miniport_timer *, ndis_handle *, +__stdcall static void ndis_create_timer(ndis_miniport_timer *, ndis_handle, ndis_timer_function, void *); __stdcall static void ndis_init_timer(ndis_timer *, ndis_timer_function, void *); -static void ndis_timercall(void *); -__stdcall static void ndis_set_timer(ndis_miniport_timer *, uint32_t); -static void ndis_tick(void *); +__stdcall static void ndis_set_timer(ndis_timer *, uint32_t); __stdcall static void ndis_set_periodic_timer(ndis_miniport_timer *, uint32_t); -__stdcall static void ndis_cancel_timer(ndis_miniport_timer *, uint8_t *); +__stdcall static void ndis_cancel_timer(ndis_timer *, uint8_t *); __stdcall static void ndis_query_resources(ndis_status *, ndis_handle, ndis_resource_list *, uint32_t *); __stdcall static ndis_status ndis_register_ioport(void **, @@ -521,6 +519,7 @@ { uint16_t *unicode; ndis_unicode_string *ustr; + int base = 0; unicode = (uint16_t *)&block->nmb_dummybuf; @@ -533,14 +532,22 @@ ustr->nus_buf = unicode; break; case ndis_parm_int: + if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) + base = 16; + else + base = 10; (*parm)->ncp_type = ndis_parm_int; (*parm)->ncp_parmdata.ncp_intdata = - strtol((char *)oid->oid_arg1, NULL, 10); + strtol((char *)oid->oid_arg1, NULL, base); break; case ndis_parm_hexint: + if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) + base = 16; + else + base = 10; (*parm)->ncp_type = ndis_parm_hexint; (*parm)->ncp_parmdata.ncp_intdata = - strtoul((char *)oid->oid_arg1, NULL, 16); + strtoul((char *)oid->oid_arg1, NULL, base); break; default: return(NDIS_STATUS_FAILURE); @@ -936,166 +943,74 @@ ndis_timer_function func; void *ctx; { - struct ndis_timer_entry *ne = NULL; - ndis_miniport_block *block = NULL; + ntoskrnl_init_timer(&timer->nt_ktimer); + ntoskrnl_init_dpc(&timer->nt_kdpc, func, ctx); - TAILQ_FOREACH(block, &ndis_devhead, link) { - if (block->nmb_miniportadapterctx == ctx) - break; - } - - if (block->nmb_miniportadapterctx != ctx) - panic("NDIS driver timer context didn't " - "match any adapter contexts"); - - ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_init(&ne->nte_ch, CALLOUT_MPSAFE); - TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); - ne->nte_timer = (ndis_miniport_timer *)timer; - - INIT_LIST_HEAD((&timer->nt_timer.nk_header.dh_waitlisthead)); - timer->nt_timer.nk_header.dh_sigstate = FALSE; - timer->nt_timer.nk_header.dh_type = EVENT_TYPE_NOTIFY; - timer->nt_timer.nk_header.dh_size = OTYPE_TIMER; - timer->nt_dpc.nk_sysarg1 = &ne->nte_ch; - timer->nt_dpc.nk_deferedfunc = (ndis_kdpc_func)func; - timer->nt_dpc.nk_deferredctx = ctx; - return; } __stdcall static void ndis_create_timer(timer, handle, func, ctx) ndis_miniport_timer *timer; - ndis_handle *handle; + ndis_handle handle; ndis_timer_function func; void *ctx; { - struct ndis_timer_entry *ne = NULL; - ndis_miniport_block *block; - block = (ndis_miniport_block *)handle; + /* Save the funcptr and context */ - ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_init(&ne->nte_ch, CALLOUT_MPSAFE); - TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); - ne->nte_timer = timer; + timer->nmt_timerfunc = func; + timer->nmt_timerctx = ctx; + timer->nmt_block = handle; - INIT_LIST_HEAD((&timer->nmt_ktimer.nk_header.dh_waitlisthead)); - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - timer->nmt_ktimer.nk_header.dh_type = EVENT_TYPE_NOTIFY; - timer->nmt_ktimer.nk_header.dh_size = OTYPE_TIMER; - timer->nmt_dpc.nk_sysarg1 = &ne->nte_ch; - timer->nmt_dpc.nk_deferedfunc = (ndis_kdpc_func)func; - timer->nmt_dpc.nk_deferredctx = ctx; + ntoskrnl_init_timer(&timer->nmt_ktimer); + ntoskrnl_init_dpc(&timer->nmt_kdpc, func, ctx); return; } /* - * The driver's timer callout is __stdcall function, so we need this - * intermediate step. - */ - -static void -ndis_timercall(arg) - void *arg; -{ - ndis_miniport_timer *timer; - __stdcall ndis_timer_function timerfunc; - - timer = arg; - - timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; - timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); - ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); - - return; -} - -/* - * Windows specifies timeouts in milliseconds. We specify timeouts - * in hz, so some conversion is required. + * In Windows, there's both an NdisMSetTimer() and an NdisSetTimer(), + * but the former is just a macro wrapper around the latter. */ __stdcall static void ndis_set_timer(timer, msecs) - ndis_miniport_timer *timer; + ndis_timer *timer; uint32_t msecs; { - struct callout *ch; - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_dpc.nk_sysarg2 = ndis_timercall; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); + /* + * KeSetTimer() wants the period in + * hundred nanosecond intervals. + */ + ntoskrnl_set_timer(&timer->nt_ktimer, + ((int64_t)msecs * -10000), &timer->nt_kdpc); return; } -static void -ndis_tick(arg) - void *arg; -{ - ndis_miniport_timer *timer; - struct callout *ch; - __stdcall ndis_timer_function timerfunc; - struct timeval tv; - - timer = arg; - - /* Automatically reload timer. */ - - tv.tv_sec = 0; - tv.tv_usec = timer->nmt_ktimer.nk_period * 1000; - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - timer->nmt_dpc.nk_sysarg2 = ndis_tick; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); - - timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; - timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); - ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); - - return; -} - __stdcall static void ndis_set_periodic_timer(timer, msecs) ndis_miniport_timer *timer; uint32_t msecs; { - struct callout *ch; - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - timer->nmt_ktimer.nk_period = msecs; - ch = timer->nmt_dpc.nk_sysarg1; - timer->nmt_dpc.nk_sysarg2 = ndis_tick; - timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; - callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); + ntoskrnl_set_timer_ex(&timer->nmt_ktimer, + ((int64_t)msecs * -10000), msecs, &timer->nmt_kdpc); return; } +/* + * Technically, this is really NdisCancelTimer(), but we also + * (ab)use it for NdisMCancelTimer(), since in our implementation + * we don't need the extra info in the ndis_miniport_timer + * structure. + */ + __stdcall static void ndis_cancel_timer(timer, cancelled) - ndis_miniport_timer *timer; + ndis_timer *timer; uint8_t *cancelled; { - struct callout *ch; - - if (timer == NULL) - return; - ch = timer->nmt_dpc.nk_sysarg1; - if (ch == NULL) - return; - callout_stop(ch); - *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; + *cancelled = ntoskrnl_cancel_timer(&timer->nt_ktimer); return; } @@ -1990,10 +1905,13 @@ ndis_init_event(event) ndis_event *event; { - event->ne_event.nk_header.dh_sigstate = FALSE; - event->ne_event.nk_header.dh_size = OTYPE_EVENT; - event->ne_event.nk_header.dh_type = EVENT_TYPE_NOTIFY; - INIT_LIST_HEAD((&event->ne_event.nk_header.dh_waitlisthead)); + /* + * NDIS events are always synchronization + * events, and should be initialized to the + * not signaled state. + */ + + ntoskrnl_init_event(&event->ne_event, EVENT_TYPE_SYNC, FALSE); return; } @@ -2001,7 +1919,7 @@ ndis_set_event(event) ndis_event *event; { - ntoskrnl_wakeup(event); + ntoskrnl_set_event(&event->ne_event, 0, 0); return; } @@ -2009,56 +1927,27 @@ ndis_reset_event(event) ndis_event *event; { - event->ne_event.nk_header.dh_sigstate = FALSE; + ntoskrnl_reset_event(&event->ne_event); return; } -/* - * This is a stripped-down version of KeWaitForSingleObject(). - * Maybe it ought to just call ntoskrnl_waitforobj() to reduce - * code duplication. - */ - __stdcall static uint8_t ndis_wait_event(event, msecs) ndis_event *event; uint32_t msecs; { - int error; - struct timeval tv; - wait_block w; - struct thread *td = curthread; + int64_t duetime; + uint32_t rval; - mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); + duetime = ((int64_t)msecs * -10000); - if (event->ne_event.nk_header.dh_sigstate == TRUE) { - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - return(TRUE); - } + rval = ntoskrnl_waitforobj((nt_dispatch_header *)event, + 0, 0, TRUE, msecs ? &duetime : NULL); - INSERT_LIST_TAIL((&event->ne_event.nk_header.dh_waitlisthead), - (&w.wb_waitlist)); + if (rval == STATUS_TIMEOUT) + return(FALSE); - tv.tv_sec = 0; - tv.tv_usec = msecs * 1000; - - w.wb_kthread = td; - w.wb_object = &event->ne_event.nk_header; - - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - - if (td->td_proc->p_flag & P_KTHREAD) - error = kthread_suspend(td->td_proc, tvtohz(&tv)); - else - error = tsleep(td, PPAUSE|PCATCH, "ndiswe", tvtohz(&tv)); - - mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); - - REMOVE_LIST_ENTRY((&w.wb_waitlist)); - - mtx_pool_unlock(ndis_mtxpool, ntoskrnl_dispatchlock); - - return(event->ne_event.nk_header.dh_sigstate); + return(TRUE); } __stdcall static ndis_status ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.28 2004/03/15 16:39:03 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.29 2004/03/20 23:39:43 wpaul Exp $"); #include #include @@ -80,25 +80,11 @@ void *, uint32_t, uint32_t *, void *, void *); __stdcall static uint32_t ntoskrnl_iofcalldriver(/*void *, void * */ void); __stdcall static void ntoskrnl_iofcompletereq(/*void *, uint8_t*/ void); -__stdcall static uint32_t ntoskrnl_waitforobj(nt_dispatch_header *, uint32_t, - uint32_t, uint8_t, int64_t *); __stdcall static uint32_t ntoskrnl_waitforobjs(uint32_t, nt_dispatch_header **, uint32_t, uint32_t, uint32_t, uint8_t, int64_t *, wait_block *); -__stdcall static void ntoskrnl_init_event(nt_kevent *, uint32_t, uint8_t); -__stdcall static void ntoskrnl_clear_event(nt_kevent *); -__stdcall static uint32_t ntoskrnl_read_event(nt_kevent *); -__stdcall static uint32_t ntoskrnl_set_event(nt_kevent *, uint32_t, uint8_t); -__stdcall static uint32_t ntoskrnl_reset_event(nt_kevent *); +static void ntoskrnl_wakeup(void *); static void ntoskrnl_timercall(void *); -__stdcall static void ntoskrnl_init_dpc(kdpc *, void *, void *); -__stdcall static void ntoskrnl_init_timer(ktimer *); -__stdcall static void ntoskrnl_init_timer_ex(ktimer *, uint32_t); -__stdcall static uint8_t ntoskrnl_set_timer(ktimer *, int64_t, kdpc *); -__stdcall static uint8_t ntoskrnl_set_timer_ex(ktimer *, int64_t, - uint32_t, kdpc *); -__stdcall static uint8_t ntoskrnl_cancel_timer(ktimer *); -__stdcall static uint8_t ntoskrnl_read_timer(ktimer *); __stdcall static void ntoskrnl_writereg_ushort(uint16_t *, uint16_t); __stdcall static uint16_t ntoskrnl_readreg_ushort(uint16_t *); __stdcall static void ntoskrnl_writereg_ulong(uint32_t *, uint32_t); @@ -325,7 +311,7 @@ return; } -void +static void ntoskrnl_wakeup(arg) void *arg; { @@ -430,7 +416,7 @@ * EINVAL, we need to use tsleep() instead. */ -__stdcall static uint32_t +__stdcall uint32_t ntoskrnl_waitforobj(obj, reason, mode, alertable, duetime) nt_dispatch_header *obj; uint32_t reason; @@ -1448,7 +1434,7 @@ return(kmutex->km_header.dh_sigstate); } -__stdcall static void +__stdcall void ntoskrnl_init_event(kevent, type, state) nt_kevent *kevent; uint32_t type; @@ -1461,7 +1447,7 @@ return; } -__stdcall static uint32_t +__stdcall uint32_t ntoskrnl_reset_event(kevent) nt_kevent *kevent; { @@ -1475,7 +1461,7 @@ return(prevstate); } -__stdcall static uint32_t +__stdcall uint32_t ntoskrnl_set_event(kevent, increment, kwait) nt_kevent *kevent; uint32_t increment; @@ -1489,7 +1475,7 @@ return(prevstate); } -__stdcall static void +__stdcall void ntoskrnl_clear_event(kevent) nt_kevent *kevent; { @@ -1497,7 +1483,7 @@ return; } -__stdcall static uint32_t +__stdcall uint32_t ntoskrnl_read_event(kevent) nt_kevent *kevent; { @@ -1669,7 +1655,11 @@ /* * If this is a periodic timer, re-arm it - * so it will fire again. + * so it will fire again. We do this before + * calling any deferred procedure calls because + * it's possible the DPC might cancel the timer, + * in which case it would be wrong for us to + * re-arm it again afterwards. */ if (timer->k_period) { @@ -1690,7 +1680,7 @@ return; } -__stdcall static void +__stdcall void ntoskrnl_init_timer(timer) ktimer *timer; { @@ -1706,7 +1696,7 @@ return; } -__stdcall static void +__stdcall void ntoskrnl_init_timer_ex(timer, type) ktimer *timer; uint32_t type; @@ -1723,7 +1713,7 @@ return; } -__stdcall static void +__stdcall void ntoskrnl_init_dpc(dpc, dpcfunc, dpcctx) kdpc *dpc; void *dpcfunc; @@ -1738,7 +1728,7 @@ return; } -__stdcall static uint8_t +__stdcall uint8_t ntoskrnl_set_timer_ex(timer, duetime, period, dpc) ktimer *timer; int64_t duetime; @@ -1784,7 +1774,7 @@ return(pending); } -__stdcall static uint8_t +__stdcall uint8_t ntoskrnl_set_timer(timer, duetime, dpc) ktimer *timer; int64_t duetime; @@ -1793,7 +1783,7 @@ return (ntoskrnl_set_timer_ex(timer, duetime, 0, dpc)); } -__stdcall static uint8_t +__stdcall uint8_t ntoskrnl_cancel_timer(timer) ktimer *timer; { @@ -1813,7 +1803,7 @@ return(pending); } -__stdcall static uint8_t +__stdcall uint8_t ntoskrnl_read_timer(timer) ktimer *timer; { ==== //depot/projects/netperf_socket/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.876 2004/03/19 07:21:22 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.877 2004/03/20 02:14:02 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -748,6 +748,7 @@ dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart dev/uart/uart_dev_z8530.c optional uart +dev/uart/uart_subr.c optional uart dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # ==== //depot/projects/netperf_socket/sys/conf/files.alpha#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.108 2004/01/13 18:05:49 des Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.109 2004/03/20 21:06:20 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -82,6 +82,7 @@ alpha/alpha/swtch.s standard alpha/alpha/sys_machdep.c standard alpha/alpha/trap.c standard +alpha/alpha/uio_machdep.c standard alpha/alpha/vm_machdep.c standard alpha/isa/isa.c optional isa alpha/isa/isa_dma.c optional isa ==== //depot/projects/netperf_socket/sys/conf/files.amd64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.29 2004/03/03 09:37:44 obrien Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.30 2004/03/20 19:36:29 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,6 +75,7 @@ amd64/amd64/sys_machdep.c standard amd64/amd64/trap.c standard amd64/amd64/tsc.c standard +amd64/amd64/uio_machdep.c standard amd64/amd64/uma_machdep.c standard amd64/amd64/vm_machdep.c standard amd64/isa/atpic.c optional atpic isa ==== //depot/projects/netperf_socket/sys/conf/files.ia64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.64 2004/01/13 15:37:23 des Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.65 2004/03/20 21:06:20 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -123,6 +123,7 @@ ia64/ia64/sys_machdep.c standard ia64/ia64/syscall.S standard ia64/ia64/trap.c standard +ia64/ia64/uio_machdep.c standard ia64/ia64/uma_machdep.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.62 2004/02/13 13:21:41 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.63 2004/03/20 22:47:30 marcel Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -165,8 +165,9 @@ rm -f tags1 sed -e 's, ../, ,' tags > tags1 -kernel-install: +.if ${MACHINE_ARCH} != "ia64" .if exists(${DESTDIR}/boot) +kernel-install-check: @if [ ! -f ${DESTDIR}/boot/device.hints ] ; then \ echo "You must set up a ${DESTDIR}/boot/device.hints file first." ; \ exit 1 ; \ @@ -175,7 +176,12 @@ echo "You must activate /boot/device.hints in loader.conf." ; \ exit 1 ; \ fi + +kernel-install: kernel-install-check +.endif .endif + +kernel-install: @if [ ! -f ${FULLKERNEL} ] ; then \ echo "You must build a kernel first." ; \ exit 1 ; \ ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.45 2004/03/18 18:05:08 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.47 2004/03/19 17:40:45 obrien Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -18,10 +18,12 @@ .if ${CC} == "icc" COPTFLAGS?=-O -.elif ${MACHINE_ARCH} == "amd64" -COPTFLAGS?=-O2 -fno-strict-aliasing -frename-registers -pipe .else +. if ${MACHINE_ARCH} == "amd64" +COPTFLAGS?=-O2 -frename-registers -pipe +. else COPTFLAGS?=-O -pipe +. endif . if ${COPTFLAGS:M-O[23s]} != "" COPTFLAGS+= -fno-strict-aliasing . endif ==== //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.43 2004/03/17 17:50:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.44 2004/03/20 21:07:36 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -127,6 +127,10 @@ AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"}, {0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, "Adaptec SCSI RAID 2410SA"}, + {0x9005, 0x0285, 0x1028, 0x0291, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, + "Dell CERC SATA RAID 2"}, + {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, + "Adaptec SCSI RAID 2810SA"}, {0, 0, 0, 0, 0, 0, 0} }; ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.37 2004/03/18 02:33:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.38 2004/03/20 20:47:08 njl Exp $"); #include "opt_acpi.h" #include @@ -281,10 +281,11 @@ /* * There isn't an interrupt, so we have to look at _PRS to get one. - * Get the set of allowed interrupts from the _PRS resource indexed by SourceIndex. + * Get the set of allowed interrupts from the _PRS resource indexed + * by SourceIndex. */ if (prsbuf.Pointer == NULL) { - device_printf(pcib, "device has no routed interrupt and no _PRS on PCI interrupt link device\n"); + device_printf(pcib, "no routed irq and no _PRS on irq link device\n"); goto out; } @@ -294,16 +295,23 @@ * future, we might use these for priority but this is good enough for * now until BIOS vendors actually mean something by using them. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 20 20:47:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F05216A4D0; Sat, 20 Mar 2004 20:47:22 -0800 (PST) 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 7315916A4CE for ; Sat, 20 Mar 2004 20:47:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B71A43D2D for ; Sat, 20 Mar 2004 20:47:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L4lMGe062450 for ; Sat, 20 Mar 2004 20:47:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4lMVd062447 for perforce@freebsd.org; Sat, 20 Mar 2004 20:47:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 20:47:22 -0800 (PST) Message-Id: <200403210447.i2L4lMVd062447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 04:47:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=49430 Change 49430 by jmallett@jmallett_oingo on 2004/03/20 20:47:05 Don't use background-clobberable registers, use temporaries. Don't futz with BDslots right now, just be obvious. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#7 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#6 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#7 $ */ #include @@ -56,8 +56,9 @@ sd sp, SF_REG_SP(a0) sd t0, SF_REG_SR(a0) sd ra, SF_REG_RA(a0) + li v0, 0 jr ra - li v0, 0 + nop END(savectx) /* @@ -70,11 +71,12 @@ move a0, a1 jal pmap_activate nop - ld k1, 0(sp) - ld k0, pcpup - sd k1, PC_CURTHREAD(k0) - ld t0, TD_PCB(k1) - sd t0, PC_CURPCB(k0) + ld t3, 0(sp) + daddu sp, 8 + ld t2, pcpup + sd t3, PC_CURTHREAD(t2) + ld t0, TD_PCB(t3) + sd t0, PC_CURPCB(t2) ld s0, SF_REG_S0(t0) ld s1, SF_REG_S1(t0) ld s2, SF_REG_S2(t0) @@ -93,8 +95,9 @@ move a2, s2 move a3, s3 mtc0 t0, MIPS_COP_0_STATUS + li v0, 1 jr ra - li v0, 1 + nop END(cpu_throw) /* From owner-p4-projects@FreeBSD.ORG Sat Mar 20 20:48:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD2E16A4D0; Sat, 20 Mar 2004 20:48:24 -0800 (PST) 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 4A89516A4CE for ; Sat, 20 Mar 2004 20:48:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 429A843D31 for ; Sat, 20 Mar 2004 20:48:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L4mOGe062501 for ; Sat, 20 Mar 2004 20:48:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4mN3o062498 for perforce@freebsd.org; Sat, 20 Mar 2004 20:48:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 20:48:23 -0800 (PST) Message-Id: <200403210448.i2L4mN3o062498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 04:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=49431 Change 49431 by jmallett@jmallett_oingo on 2004/03/20 20:47:39 Rework to return the trapframe. Affected files ... .. //depot/projects/mips/sys/mips/mips/trap.c#18 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/trap.c#18 (text+ko) ==== @@ -87,9 +87,9 @@ #define MAXTRAPID 31 /* XXX belongs in a header some day? */ -void trap(struct trapframe *, u_int, void *); +struct trapframe *trap(struct trapframe *, u_int, void *); -void +struct trapframe * trap(struct trapframe *tf, u_int cause, void *badvaddr) { struct trap_identifier *tid; @@ -99,6 +99,10 @@ code = (cause & MIPS_CR_EXC_CODE) >> MIPS_CR_EXC_CODE_SHIFT; kernelmode = (tf->tf_regs[TF_SR] & MIPS_SR_KSU_USER) == 0; + + if (curthread != NULL) { + curthread->td_frame = tf; + } /* * Handle that which we can. @@ -108,13 +112,17 @@ /* XXX Kernel only. */ tlb_modified(badvaddr); platform_trap_exit(); - return; + if (curthread) + tf = curthread->td_frame; + return (tf); case TrInt: platform_trap_exit(); atomic_add_int(&curthread->td_intr_nesting_level, 1); platform_intr(tf); atomic_subtract_int(&curthread->td_intr_nesting_level, 1); - return; + if (curthread) + tf = curthread->td_frame; + return (tf); default: /* Fatal! */ break; @@ -154,14 +162,12 @@ #if DDB default: kdb_trap(code, tf); - break; + goto done; #else default: goto dopanic; #endif } - platform_trap_exit(); - return; #ifndef DDB dopanic: if (panicstr != NULL) { @@ -169,6 +175,10 @@ cpu_reset(); } panic("trap"); +#endif +done: platform_trap_exit(); -#endif + if (curthread) + tf = curthread->td_frame; + return (tf); } From owner-p4-projects@FreeBSD.ORG Sat Mar 20 20:51:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF19716A4D0; Sat, 20 Mar 2004 20:51:28 -0800 (PST) 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 B9D5516A4CE for ; Sat, 20 Mar 2004 20:51:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B227343D2D for ; Sat, 20 Mar 2004 20:51:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L4pSGe063441 for ; Sat, 20 Mar 2004 20:51:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4pSlu063435 for perforce@freebsd.org; Sat, 20 Mar 2004 20:51:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 20:51:28 -0800 (PST) Message-Id: <200403210451.i2L4pSlu063435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 04:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=49432 Change 49432 by jmallett@jmallett_oingo on 2004/03/20 20:50:51 Stay kernel mode without exceptions through exception processing. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#24 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#24 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#23 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#24 $ */ #include "opt_ddb.h" @@ -121,19 +121,31 @@ jal save_kdbaux nop #endif /* DDB */ + li t0, MIPS_SR_KX + mtc0 t0, MIPS_COP_0_STATUS /* * Call trap() with arguments: * trapframe, cause, badvaddr. * * The trapframe is copied from k1 to a0 in the BDslot. + * + * trap returns the frame. */ mfc0 a1, MIPS_COP_0_CAUSE dmfc0 a2, MIPS_COP_0_BAD_VADDR jal trap move a0, k1 - move k1, sp + /* + * Make sure interrupts are disabled for the purposes of + * having a clean go at restoring. + */ + mtc0 zero, MIPS_COP_0_CAUSE + li t0, MIPS_SR_KX + mtc0 t0, MIPS_COP_0_STATUS + + move k1, v0 jal exception_restore_registers nop daddu sp, sp, TF_SIZE From owner-p4-projects@FreeBSD.ORG Sat Mar 20 21:01:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEAEC16A4D0; Sat, 20 Mar 2004 21:01:41 -0800 (PST) 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 B44A716A4CE for ; Sat, 20 Mar 2004 21:01:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9593143D2D for ; Sat, 20 Mar 2004 21:01:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L51fGe065617 for ; Sat, 20 Mar 2004 21:01:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L51flP065611 for perforce@freebsd.org; Sat, 20 Mar 2004 21:01:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 21:01:41 -0800 (PST) Message-Id: <200403210501.i2L51flP065611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 05:01:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=49433 Change 49433 by jmallett@jmallett_oingo on 2004/03/20 21:01:19 Make sure there's no foot shooting just yet. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#34 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#34 (text+ko) ==== @@ -207,6 +207,8 @@ static PMAP_INLINE pt_entry_t* pmap_pte(pmap_t pmap, vm_offset_t va) { + if (pmap != kernel_pmap) + panic("non kernel pmap unsupported"); if (pmap == NULL || pmap->pm_lev1 == NULL) return NULL; return tlb_pte_find(pmap->pm_lev1, va); From owner-p4-projects@FreeBSD.ORG Sat Mar 20 21:07:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE57916A4D0; Sat, 20 Mar 2004 21:07:49 -0800 (PST) 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 990E416A4CE for ; Sat, 20 Mar 2004 21:07:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9136E43D1D for ; Sat, 20 Mar 2004 21:07:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L57nGe067573 for ; Sat, 20 Mar 2004 21:07:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L57nNL067570 for perforce@freebsd.org; Sat, 20 Mar 2004 21:07:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 21:07:49 -0800 (PST) Message-Id: <200403210507.i2L57nNL067570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 05:07:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=49434 Change 49434 by jmallett@jmallett_oingo on 2004/03/20 21:07:07 Delay restoring SR. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#25 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#25 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#24 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#25 $ */ #include "opt_ddb.h" @@ -294,7 +294,9 @@ ld a1, TF_REG_EPC(k1) ld a0, TF_REG_MULHI(k1) ld v1, TF_REG_MULLO(k1) +#if 0 ld v0, TF_REG_SR(k1) +#endif ld ra, TF_REG_RA(k1) ld t9, TF_REG_T9(k1) @@ -314,7 +316,9 @@ dmtc0 a1, MIPS_COP_0_EXC_PC mthi a0 mtlo v1 +#if 0 mtc0 v0, MIPS_COP_0_STATUS +#endif /* * Now restore the registers we used for scratch, and nearby @@ -339,9 +343,18 @@ */ .set noat ld AT, TF_REG_AST(k1) - +#if 1 + /* XXX + * We wait until now so we don't interrupt ourselves. + */ + ld k1, TF_REG_SR(k1) + jr k0 + mtc0 k1, MIPS_COP_0_STATUS +#else jr k0 nop +#endif + .set at END(exception_restore_registers) From owner-p4-projects@FreeBSD.ORG Sat Mar 20 21:19:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3ACB16A4D0; Sat, 20 Mar 2004 21:19:04 -0800 (PST) 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 7716C16A4CE for ; Sat, 20 Mar 2004 21:19:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C53A43D39 for ; Sat, 20 Mar 2004 21:19:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L5J4Ge069637 for ; Sat, 20 Mar 2004 21:19:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L5J38e069634 for perforce@freebsd.org; Sat, 20 Mar 2004 21:19:03 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 21:19:03 -0800 (PST) Message-Id: <200403210519.i2L5J38e069634@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 Subject: PERFORCE change 49436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 05:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=49436 Change 49436 by marcel@marcel_nfs on 2004/03/20 21:18:38 IFC @49435 Affected files ... .. //depot/projects/gdb/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/gdb/sys/netatalk/at_control.c#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#2 integrate Differences ... ==== //depot/projects/gdb/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.47 2004/03/19 17:40:45 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.48 2004/03/21 05:10:34 marcel Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -21,6 +21,8 @@ .else . if ${MACHINE_ARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe +. elif ${MACHINE_ARCH} == "ia64" +COPTFLAGS?=-O2 -pipe . else COPTFLAGS?=-O -pipe . endif ==== //depot/projects/gdb/sys/netatalk/at_control.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/at_control.c,v 1.35 2003/11/28 04:19:41 sam Exp $ + * $FreeBSD: src/sys/netatalk/at_control.c,v 1.36 2004/03/21 03:28:08 rwatson Exp $ */ #include @@ -50,7 +50,7 @@ struct netrange *nr; struct at_aliasreq *ifra = (struct at_aliasreq *)data; struct at_ifaddr *aa0; - struct at_ifaddr *aa = 0; + struct at_ifaddr *aa = NULL; struct ifaddr *ifa, *ifa0; /* @@ -90,7 +90,7 @@ * If we a retrying to delete an addres but didn't find such, * then rewurn with an error */ - if ( cmd == SIOCDIFADDR && aa == 0 ) { + if ( cmd == SIOCDIFADDR && aa == NULL ) { return( EADDRNOTAVAIL ); } /*FALLTHROUGH*/ @@ -130,14 +130,14 @@ } } - if ( ifp == 0 ) + if ( ifp == NULL ) panic( "at_control" ); /* * If we failed to find an existing at_ifaddr entry, then we * allocate a fresh one. */ - if ( aa == (struct at_ifaddr *) 0 ) { + if ( aa == NULL ) { aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO); if (( aa = at_ifaddr ) != NULL ) { /* @@ -224,7 +224,7 @@ } } - if ( aa == (struct at_ifaddr *) 0 ) + if ( aa == NULL ) return( EADDRNOTAVAIL ); break; } @@ -301,7 +301,7 @@ break; default: - if ( ifp == 0 || ifp->if_ioctl == 0 ) + if ( ifp == NULL || ifp->if_ioctl == NULL ) return( EOPNOTSUPP ); return( (*ifp->if_ioctl)( ifp, cmd, data )); } ==== //depot/projects/gdb/sys/netatalk/ddp_input.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.19 2003/11/08 22:28:39 sam Exp $ + * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.20 2004/03/21 03:28:08 rwatson Exp $ */ #include "opt_mac.h" @@ -56,7 +56,7 @@ /* * Phase 1 packet handling */ - if (m->m_len < SZ_ELAPHDR && ((m = m_pullup(m, SZ_ELAPHDR)) == 0)) { + if (m->m_len < SZ_ELAPHDR && ((m = m_pullup(m, SZ_ELAPHDR)) == NULL)) { ddpstat.ddps_tooshort++; return; } @@ -105,7 +105,7 @@ ddpstat.ddps_short++; if ( m->m_len < sizeof( struct ddpshdr ) && - (( m = m_pullup( m, sizeof( struct ddpshdr ))) == 0 )) { + (( m = m_pullup( m, sizeof( struct ddpshdr ))) == NULL )) { ddpstat.ddps_tooshort++; return; } @@ -151,7 +151,7 @@ ddpstat.ddps_long++; if ( m->m_len < sizeof( struct ddpehdr ) && - (( m = m_pullup( m, sizeof( struct ddpehdr ))) == 0 )) { + (( m = m_pullup( m, sizeof( struct ddpehdr ))) == NULL )) { ddpstat.ddps_tooshort++; return; } @@ -280,7 +280,7 @@ && ( satosat(&forwro.ro_dst)->sat_addr.s_net != to.sat_addr.s_net || satosat(&forwro.ro_dst)->sat_addr.s_node != to.sat_addr.s_node )) { RTFREE( forwro.ro_rt ); - forwro.ro_rt = (struct rtentry *)0; + forwro.ro_rt = NULL; } /* @@ -288,8 +288,7 @@ * Then get a new route. * XXX this could cause a 'route leak'. check this! */ - if ( forwro.ro_rt == (struct rtentry *)0 - || forwro.ro_rt->rt_ifp == (struct ifnet *)0 ) { + if ( forwro.ro_rt == NULL || forwro.ro_rt->rt_ifp == NULL ) { forwro.ro_dst.sa_len = sizeof( struct sockaddr_at ); forwro.ro_dst.sa_family = AF_APPLETALK; satosat(&forwro.ro_dst)->sat_addr.s_net = to.sat_addr.s_net; @@ -377,7 +376,7 @@ * If we found one, deliver th epacket to the socket */ if ( sbappendaddr( &ddp->ddp_socket->so_rcv, (struct sockaddr *)&from, - m, (struct mbuf *)0 ) == 0 ) { + m, NULL ) == 0 ) { /* * If the socket is full (or similar error) dump the packet. */ ==== //depot/projects/gdb/sys/netatalk/ddp_output.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ * netatalk@itd.umich.edu */ -/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.20 2003/10/31 18:32:10 brooks Exp $ */ +/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.21 2004/03/21 03:28:08 rwatson Exp $ */ #include "opt_mac.h" @@ -199,7 +199,7 @@ */ if ( !(aa->aa_flags & AFA_PHASE2) ) { MGET( m0, M_TRYWAIT, MT_HEADER ); - if ( m0 == 0 ) { + if ( m0 == NULL ) { m_freem( m ); printf("ddp_route: no buffers\n"); return( ENOBUFS ); ==== //depot/projects/gdb/sys/netatalk/ddp_pcb.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.37 2004/03/19 07:21:22 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.38 2004/03/21 03:28:08 rwatson Exp $ */ #include @@ -42,7 +42,7 @@ return( EINVAL ); } - if (addr != 0) { /* validate passed address */ + if (addr != NULL) { /* validate passed address */ sat = (struct sockaddr_at *)addr; if (sat->sat_family != AF_APPLETALK) { return(EAFNOSUPPORT); @@ -95,7 +95,7 @@ if ( sat->sat_port == ATADDR_ANYPORT ) { for ( sat->sat_port = ATPORT_RESERVED; sat->sat_port < ATPORT_LAST; sat->sat_port++ ) { - if ( ddp_ports[ sat->sat_port - 1 ] == 0 ) { + if ( ddp_ports[ sat->sat_port - 1 ] == NULL ) { break; } } @@ -130,7 +130,7 @@ { struct sockaddr_at *sat = (struct sockaddr_at *)addr; struct route *ro; - struct at_ifaddr *aa = 0; + struct at_ifaddr *aa = NULL; struct ifnet *ifp; u_short hintnet = 0, net; @@ -163,7 +163,7 @@ } else { net = sat->sat_addr.s_net; } - aa = 0; + aa = NULL; if ((ifp = ro->ro_rt->rt_ifp) != NULL) { for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { if ( aa->aa_ifp == ifp && @@ -178,15 +178,14 @@ satosat( &ro->ro_dst )->sat_addr.s_node != sat->sat_addr.s_node )) { RTFREE( ro->ro_rt ); - ro->ro_rt = (struct rtentry *)0; + ro->ro_rt = NULL; } } /* * If we've got no route for this interface, try to find one. */ - if ( ro->ro_rt == (struct rtentry *)0 || - ro->ro_rt->rt_ifp == (struct ifnet *)0 ) { + if ( ro->ro_rt == NULL || ro->ro_rt->rt_ifp == NULL ) { ro->ro_dst.sa_len = sizeof( struct sockaddr_at ); ro->ro_dst.sa_family = AF_APPLETALK; if ( hintnet ) { @@ -201,7 +200,7 @@ /* * Make sure any route that we have has a valid interface. */ - aa = 0; + aa = NULL; if ( ro->ro_rt && ( ifp = ro->ro_rt->rt_ifp )) { for ( aa = at_ifaddr; aa; aa = aa->aa_next ) { if ( aa->aa_ifp == ifp ) { @@ -209,13 +208,13 @@ } } } - if ( aa == 0 ) { + if ( aa == NULL ) { return( ENETUNREACH ); } ddp->ddp_fsat = *sat; if ( ddp->ddp_lsat.sat_port == ATADDR_ANYPORT ) { - return(at_pcbsetaddr(ddp, (struct sockaddr *)0, td)); + return(at_pcbsetaddr(ddp, NULL, td)); } return( 0 ); } @@ -254,7 +253,7 @@ at_pcbdetach( struct socket *so, struct ddpcb *ddp) { soisdisconnected( so ); - so->so_pcb = 0; + so->so_pcb = NULL; sotryfree(so); /* remove ddp from ddp_ports list */ From owner-p4-projects@FreeBSD.ORG Sat Mar 20 21:25:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C109716A4D0; Sat, 20 Mar 2004 21:25:12 -0800 (PST) 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 83F7616A4CE for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6466643D31 for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L5PCGe071513 for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L5PCnw071510 for perforce@freebsd.org; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 21:25:12 -0800 (PST) Message-Id: <200403210525.i2L5PCnw071510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 05:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=49437 Change 49437 by jmallett@jmallett_oingo on 2004/03/20 21:24:34 Handle misses/reloads with the same body of code. This means the common case (miss, not reload) takes an extra branch... Ha. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#26 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#26 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#25 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#26 $ */ #include "opt_ddb.h" @@ -49,8 +49,8 @@ ExceptionHandlerTable: .dword GenericException /* Int */ .dword GenericException /* TLBMod */ - .dword XTLBReload /* TLBL */ - .dword XTLBReload /* TLBS */ + .dword XTLBMissVector /* TLBL */ + .dword XTLBMissVector /* TLBS */ .dword GenericException /* AdEL */ .dword GenericException /* AdES */ .dword GenericException /* IBE */ @@ -184,26 +184,8 @@ /* * XXX kernel only. For now that makes sense. */ -LEAF(XTLBReload) +LEAF(XTLBMissVector) .set noat - tlbp - nop - mfc0 k0, MIPS_COP_0_TLB_INDEX - nop - blezl k0, 1f - nop - /* We have an index, it's a reload. XXX Copying from XTLBMiss - * because I can't make that tlbwi, unless I pick a random - * Index for it, and somehow that doesn't feel good. XXX2 Note - * that TLBS is just a degenerate case of Mod, it's where the - * mapping needs set up into the TLB, as well, cause it was - * created after the other entry in the TLB, and is invalid - * in the TLB. It actually could go through the Mod code and - * work fine, but I'd rather take two exceptions. The other - * side of this argument is that tlb_enter should update the - * TLB. This is possibly true, but I like lazy loading, since - * we have to reload a lot in theory, anyway. - */ dmfc0 k0, MIPS_COP_0_BAD_VADDR dli k1, MIPS_XKSEG_START tltu k0, k1 @@ -232,47 +214,16 @@ dmtc0 k0, MIPS_COP_0_TLB_LO0 dmtc0 k1, MIPS_COP_0_TLB_LO1 nop + + tlbp + mfc0 k0, MIPS_COP_0_TLB_INDEX + nop + bltz k0, 1f + nop + tlbwi eret - /* Not in TLB, it's a miss. */ -1: j XTLBMissVector - nop - .set at -END(XTLBReload) - -/* - * XXX kernel only. For now that makes sense. - */ -LEAF(XTLBMissVector) - .set noat - dmfc0 k0, MIPS_COP_0_BAD_VADDR - dli k1, MIPS_XKSEG_START - tltu k0, k1 - dsubu k0, k1 - /* - * Shift right logical to get a page index, but leaving - * enough bits to index an array of 64 bit values, plus - * align for the even/odd TLB stuff. - */ - dsrl k0, PAGE_SHIFT + 1 - dsll k0, 3 + 1 - dla k1, kptmap - /* - * Find the page table, and index it. - */ - ld k1, 0(k1) - addu k1, k0 - /* - * Write the pair. - */ - ld k0, 0(k1) /* Even PTE. */ - ld k1, 8(k1) /* Odd PTE. */ - /* - * Write TLB entry. - */ - dmtc0 k0, MIPS_COP_0_TLB_LO0 - dmtc0 k1, MIPS_COP_0_TLB_LO1 - nop +1: tlbwr eret .set at From owner-p4-projects@FreeBSD.ORG Sat Mar 20 21:25:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CFEF16A4D3; Sat, 20 Mar 2004 21:25:13 -0800 (PST) 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 F22C916A4ED for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0C3E43D31 for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L5PCGe071520 for ; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L5PCVe071516 for perforce@freebsd.org; Sat, 20 Mar 2004 21:25:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 21:25:12 -0800 (PST) Message-Id: <200403210525.i2L5PCVe071516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 05:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=49438 Change 49438 by jmallett@jmallett_oingo on 2004/03/20 21:25:05 Hurgle. Affected files ... .. //depot/projects/mips/gnu/usr.bin/binutils/libbfd/mips/bfd.h#2 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/binutils/libbfd/mips/bfd.h#2 (text+ko) ==== @@ -59,7 +59,7 @@ #define BFD_ARCH_SIZE 64 /* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 32 +#define BFD_DEFAULT_TARGET_SIZE 64 /* * XXXMIPS By default, we want to use 32-bitness... But allow 64... From owner-p4-projects@FreeBSD.ORG Sat Mar 20 22:14:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AEFA16A4D0; Sat, 20 Mar 2004 22:14:36 -0800 (PST) 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 34BB616A4CE for ; Sat, 20 Mar 2004 22:14:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AB7043D49 for ; Sat, 20 Mar 2004 22:14:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L6EaGe083174 for ; Sat, 20 Mar 2004 22:14:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L6EZdV083171 for perforce@freebsd.org; Sat, 20 Mar 2004 22:14:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 22:14:35 -0800 (PST) Message-Id: <200403210614.i2L6EZdV083171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 06:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=49442 Change 49442 by jmallett@jmallett_oingo on 2004/03/20 22:14:04 Critical section madness. Affected files ... .. //depot/projects/mips/sys/mips/include/critical.h#4 edit .. //depot/projects/mips/sys/mips/include/proc.h#4 edit .. //depot/projects/mips/sys/mips/mips/critical.c#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/critical.h#4 (text+ko) ==== @@ -1,6 +1,28 @@ /*- - * Copyright (c) 2002 Matthew Dillon. This code is distributed under - * the BSD copyright, /usr/src/COPYRIGHT. + * Copyright (c) 2002 Matthew Dillon. 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. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. * * This file contains prototypes and high-level inlines related to * machine-level critical function support: @@ -8,23 +30,23 @@ * cpu_critical_enter() - inlined * cpu_critical_exit() - inlined * cpu_critical_fork_exit() - prototyped - * cpu_thread_link() - prototyped * related support functions residing * in //critical.c - prototyped * - * $FreeBSD$ + * $P4: //depot/projects/mips/sys/mips/include/critical.h#4 $ */ #ifndef _MACHINE_CRITICAL_H_ #define _MACHINE_CRITICAL_H_ +#include + __BEGIN_DECLS /* * Prototypes - see //critical.c */ void cpu_critical_fork_exit(void); -void cpu_thread_link(struct thread *td); #ifdef __GNUC__ @@ -34,11 +56,13 @@ * This routine is called from critical_enter() on the 0->1 transition * of td_critnest, prior to it being incremented to 1. */ - static __inline void cpu_critical_enter(void) { - struct thread *td __unused = curthread; + struct thread *td; + + td = curthread; + td->td_md.md_savecrit = intr_disable(); } /* @@ -51,14 +75,16 @@ static __inline void cpu_critical_exit(void) { - struct thread *td __unused = curthread; + struct thread *td; + + td = curthread; + intr_restore(td->td_md.md_savecrit); } - #else /* !__GNUC__ */ -void cpu_critical_enter(void) -void cpu_critical_exit(void) +void cpu_critical_enter(void); +void cpu_critical_exit(void); #endif /* __GNUC__ */ ==== //depot/projects/mips/sys/mips/include/proc.h#4 (text+ko) ==== @@ -33,6 +33,7 @@ }; struct mdthread { + __register_t md_savecrit; /* critical section saved SR */ void *md_regs; /* registers on current frame */ int md_flags; /* machine-dependent flags */ }; ==== //depot/projects/mips/sys/mips/mips/critical.c#2 (text+ko) ==== @@ -1,23 +1,35 @@ /*- - * Copyright (c) 2001 Matthew Dillon. This code is distributed under - * the BSD copyright, /usr/src/COPYRIGHT. + * Copyright (c) 2004 Juli Mallett + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/critical.c,v 1.6 2002/06/23 14:38:41 mux Exp $ + * $P4: //depot/projects/mips/sys/mips/mips/critical.c#2 $ */ #include #include -#include -#include /* XX */ -#include /* XX */ -#include -#include /* XX */ #include #include -#include -#include -#include -#include #include /* @@ -26,12 +38,5 @@ void cpu_critical_fork_exit(void) { -} - -/* - * cpu_thread_link() - thread linkup, initialize machine-dependant fields - */ -void -cpu_thread_link(struct thread *td) -{ + panic("%s", __func__); } From owner-p4-projects@FreeBSD.ORG Sat Mar 20 22:58:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44CBA16A4D0; Sat, 20 Mar 2004 22:58:39 -0800 (PST) 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 12C4916A4CE for ; Sat, 20 Mar 2004 22:58:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0541643D31 for ; Sat, 20 Mar 2004 22:58:39 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L6wcGe091596 for ; Sat, 20 Mar 2004 22:58:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L6wVhf091566 for perforce@freebsd.org; Sat, 20 Mar 2004 22:58:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 20 Mar 2004 22:58:31 -0800 (PST) Message-Id: <200403210658.i2L6wVhf091566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 49446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2004 06:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=49446 Change 49446 by jmallett@jmallett_oingo on 2004/03/20 22:57:51 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#26 integrate .. //depot/projects/mips/UPDATING#17 integrate .. //depot/projects/mips/UPDATING.64BTT#3 integrate .. //depot/projects/mips/bin/kill/kill.c#4 integrate .. //depot/projects/mips/bin/pax/cache.c#4 integrate .. //depot/projects/mips/bin/ps/ps.1#7 integrate .. //depot/projects/mips/bin/ps/ps.c#7 integrate .. //depot/projects/mips/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/mips/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/mips/bin/sh/Makefile#5 integrate .. //depot/projects/mips/contrib/binutils/include/getopt.h#3 delete .. //depot/projects/mips/contrib/binutils/libiberty/getopt.c#2 delete .. //depot/projects/mips/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/mips/contrib/pf/authpf/authpf.c#2 integrate .. //depot/projects/mips/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl.c#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl.h#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_parser.h#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_table.c#2 integrate .. //depot/projects/mips/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/mips/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/mips/contrib/sort/Makefile#2 delete .. //depot/projects/mips/contrib/sort/append.c#2 delete .. //depot/projects/mips/contrib/sort/extern.h#2 delete .. //depot/projects/mips/contrib/sort/fields.c#2 delete .. //depot/projects/mips/contrib/sort/files.c#2 delete .. //depot/projects/mips/contrib/sort/fsort.c#2 delete .. //depot/projects/mips/contrib/sort/fsort.h#2 delete .. //depot/projects/mips/contrib/sort/init.c#2 delete .. //depot/projects/mips/contrib/sort/msort.c#2 delete .. //depot/projects/mips/contrib/sort/pathnames.h#2 delete .. //depot/projects/mips/contrib/sort/regress/Makefile#2 delete .. //depot/projects/mips/contrib/sort/regress/stests#2 delete .. //depot/projects/mips/contrib/sort/sort.1#2 delete .. //depot/projects/mips/contrib/sort/sort.c#2 delete .. //depot/projects/mips/contrib/sort/sort.h#2 delete .. //depot/projects/mips/contrib/sort/tmp.c#2 delete .. //depot/projects/mips/crypto/openssh/sshd_config#8 integrate .. //depot/projects/mips/crypto/openssh/sshd_config.5#8 integrate .. //depot/projects/mips/crypto/openssl/CHANGES#5 integrate .. //depot/projects/mips/crypto/openssl/Configure#5 integrate .. //depot/projects/mips/crypto/openssl/FAQ#5 integrate .. //depot/projects/mips/crypto/openssl/LICENSE#3 integrate .. //depot/projects/mips/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/mips/crypto/openssl/Makefile.ssl#5 integrate .. //depot/projects/mips/crypto/openssl/NEWS#5 integrate .. //depot/projects/mips/crypto/openssl/README#5 integrate .. //depot/projects/mips/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/mips/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/mips/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/mips/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/mips/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/mips/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/mips/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/mips/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/pkcs7.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/s_socket.c#3 integrate .. //depot/projects/mips/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/mips/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/mips/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/mips/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/mips/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/mips/crypto/openssl/config#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/Makefile.ssl#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/aes/aes_cbc.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_time.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/asn1_par.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/bf/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/b_print.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/b_sock.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/bio_cb.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/bss_conn.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bio/bss_file.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/asm/bn-586.pl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/buffer/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/cast/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/comp/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/cversion.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/cfb_enc.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/des/ecb_enc.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dh/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/dsa/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/dso/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/dso/dso_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/ec/Makefile.ssl#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/engine/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/engine/eng_fat.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/bio_ok.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_pbe.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/evp/evp_pkey.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/hmac/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/idea/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/krb5/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/lhash/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/md2/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/md4/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/md5/Makefile.ssl#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/mdc2/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/mem.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/mem_dbg.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/objects/obj_dat.pl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/ocsp/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/mips/crypto/openssl/crypto/pem/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/pkcs12/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pkcs7/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/pkcs7/pk7_doit.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rc2/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rc4/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rc5/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/ripemd/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rsa/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/sha/Makefile.ssl#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/stack/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/threads/mttest.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/txt_db/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/ui/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509_txt.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/v3_crld.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/mips/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/apps/openssl.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/apps/s_client.pod#4 integrate .. //depot/projects/mips/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/mips/crypto/openssl/doc/apps/smime.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/mips/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/mips/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/EVP_DigestInit.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/mips/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/mips/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/RSA_print.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/des.pod#3 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/crypto/ui.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/mips/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/mips/crypto/openssl/openssl.spec#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_pkt.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_clnt.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_enc.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_asn1.c#3 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/mips/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/mips/crypto/openssl/tools/Makefile.ssl#3 integrate .. //depot/projects/mips/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/mips/crypto/openssl/util/extract-names.pl#3 integrate .. //depot/projects/mips/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/mips/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/mips/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/mips/etc/ftpusers#3 integrate .. //depot/projects/mips/etc/mail/aliases#5 integrate .. //depot/projects/mips/etc/rc.d/Makefile#11 integrate .. //depot/projects/mips/etc/rc.d/devfs#6 integrate .. //depot/projects/mips/etc/rc.d/mixer#1 branch .. //depot/projects/mips/etc/rc.d/ramdisk#1 branch .. //depot/projects/mips/etc/rc.d/savecore#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gasp/Makefile#6 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/Makefile#8 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libbfd/i386/bfd.h#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#4 integrate .. //depot/projects/mips/gnu/usr.bin/patch/patch.1#2 integrate .. //depot/projects/mips/include/resolv.h#5 integrate .. //depot/projects/mips/include/stdio.h#6 integrate .. //depot/projects/mips/lib/csu/amd64/crti.S#2 integrate .. //depot/projects/mips/lib/csu/amd64/crtn.S#2 integrate .. //depot/projects/mips/lib/libalias/alias.c#4 integrate .. //depot/projects/mips/lib/libalias/alias.h#4 integrate .. //depot/projects/mips/lib/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_db.c#4 integrate .. //depot/projects/mips/lib/libalias/alias_ftp.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_irc.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_local.h#4 integrate .. //depot/projects/mips/lib/libalias/alias_nbt.c#4 integrate .. //depot/projects/mips/lib/libalias/alias_old.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_pptp.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_proxy.c#4 integrate .. //depot/projects/mips/lib/libalias/alias_skinny.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_smedia.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_util.c#3 integrate .. //depot/projects/mips/lib/libarchive/Makefile#3 integrate .. //depot/projects/mips/lib/libarchive/archive.h#4 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/mips/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/mips/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_gnutar.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/mips/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/mips/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_write_open_file.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/mips/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/mips/lib/libarchive/tar.5#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/flt_rounds.c#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/fpgetround.c#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/fpgetsticky.c#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/fpsetround.c#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/fpsetsticky.c#2 integrate .. //depot/projects/mips/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/mips/lib/libc/net/nsdispatch.c#4 integrate .. //depot/projects/mips/lib/libc/net/res_send.c#4 integrate .. //depot/projects/mips/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/fileno.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/fseek.3#6 integrate .. //depot/projects/mips/lib/libc/stdio/funopen.3#3 integrate .. //depot/projects/mips/lib/libc/stdio/getc.3#6 integrate .. //depot/projects/mips/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/getwc.3#4 integrate .. //depot/projects/mips/lib/libc/stdio/putc.3#6 integrate .. //depot/projects/mips/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/putwc.3#5 integrate .. //depot/projects/mips/lib/libc/stdio/stdio.3#5 integrate .. //depot/projects/mips/lib/libc/stdio/ungetwc.3#3 integrate .. //depot/projects/mips/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/mips/lib/libc/sys/mount.2#5 integrate .. //depot/projects/mips/lib/libc/sys/select.2#7 integrate .. //depot/projects/mips/lib/libdisk/chunk.c#9 integrate .. //depot/projects/mips/lib/libdisk/create_chunk.c#13 integrate .. //depot/projects/mips/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/mips/lib/libdisk/libdisk.h#11 integrate .. //depot/projects/mips/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/mips/lib/libdisk/rules.c#10 integrate .. //depot/projects/mips/lib/libpam/Makefile.inc#6 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigwait.c#6 integrate .. //depot/projects/mips/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/mips/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/mips/libexec/rtld-elf/debug.h#2 integrate .. //depot/projects/mips/libexec/rtld-elf/libmap.c#5 integrate .. //depot/projects/mips/libexec/rtld-elf/libmap.h#3 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#16 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 integrate .. //depot/projects/mips/rescue/rescue/Makefile#5 integrate .. //depot/projects/mips/sbin/Makefile#16 integrate .. //depot/projects/mips/sbin/atacontrol/atacontrol.c#7 integrate .. //depot/projects/mips/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/mips/sbin/kldstat/kldstat.c#4 integrate .. //depot/projects/mips/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/mips/sbin/raidctl/Makefile#2 delete .. //depot/projects/mips/sbin/raidctl/raidctl.8#5 delete .. //depot/projects/mips/sbin/raidctl/raidctl.c#3 delete .. //depot/projects/mips/sbin/raidctl/rf_configure.c#3 delete .. //depot/projects/mips/sbin/vinum/commands.c#9 integrate .. //depot/projects/mips/secure/lib/libcrypto/Makefile.inc#8 integrate .. //depot/projects/mips/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ASN1_STRING_length.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ASN1_STRING_new.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_ctrl.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_base64.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_buffer.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_cipher.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_md.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_null.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_f_ssl.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_find_type.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_push.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_read.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_accept.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_bio.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_connect.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_fd.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_file.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_mem.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_null.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_s_socket.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_set_callback.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BIO_should_retry.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_CTX_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_CTX_start.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_add.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_add_word.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_bn2bin.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_cmp.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_copy.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_generate_prime.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_mod_inverse.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_num_bytes.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_rand.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_set_bit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_swap.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/BN_zero.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/CONF_modules_free.3#1 branch .. //depot/projects/mips/secure/lib/libcrypto/man/CONF_modules_load_file.3#1 branch .. //depot/projects/mips/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_generate_key.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_generate_parameters.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_get_ex_new_index.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_set_method.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DH_size.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_SIG_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_do_sign.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_dup_DH.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_generate_key.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_generate_parameters.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_set_method.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_sign.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/DSA_size.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_GET_LIB.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_clear_error.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_error_string.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_get_error.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_load_strings.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_print_errors.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_put_error.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ERR_remove_state.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_BytesToKey.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_DigestInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_EncryptInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_OpenInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_PKEY_new.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_SealInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_SignInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/EVP_VerifyInit.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/OBJ_nid2obj.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/OPENSSL_config.3#1 branch .. //depot/projects/mips/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#1 branch .. //depot/projects/mips/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS12_create.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS12_parse.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS7_decrypt.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS7_encrypt.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS7_sign.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/PKCS7_verify.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_add.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_bytes.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_cleanup.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_egd.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_load_file.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RAND_set_rand_method.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_blinding_on.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_check_key.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_generate_key.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_new.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_print.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_private_encrypt.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_public_encrypt.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_set_method.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_sign.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/RSA_size.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/X509_NAME_print_ex.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/X509_new.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/bio.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/blowfish.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/bn.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/bn_internal.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/buffer.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/crypto.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_DHparams.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509_CRL.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509_NAME.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509_REQ.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/d2i_X509_SIG.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/des.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/dh.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/dsa.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/engine.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/err.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/evp.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/hmac.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/lh_stats.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/lhash.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/md5.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/mdc2.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/pem.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/rand.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/rc4.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ripemd.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/rsa.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/sha.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/threads.3#5 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ui.3#4 integrate .. //depot/projects/mips/secure/lib/libcrypto/man/ui_compat.3#4 integrate .. //depot/projects/mips/share/examples/pppd/ppp.deny.sample#3 integrate .. //depot/projects/mips/share/man/man4/Makefile#25 integrate .. //depot/projects/mips/share/man/man4/de.4#3 integrate .. //depot/projects/mips/share/man/man4/firewire.4#10 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#14 integrate .. //depot/projects/mips/share/man/man4/man4.i386/acpi_toshiba.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/mips/share/man/man4/man4.i386/asc.4#2 delete .. //depot/projects/mips/share/man/man4/man4.i386/gsc.4#3 delete .. //depot/projects/mips/share/man/man4/man4.i386/le.4#2 delete .. //depot/projects/mips/share/man/man4/man4.i386/rdp.4#3 delete .. //depot/projects/mips/share/man/man4/raid.4#5 delete .. //depot/projects/mips/share/man/man9/Makefile#19 integrate .. //depot/projects/mips/share/man/man9/bus_alloc_resource.9#6 integrate .. //depot/projects/mips/share/man/man9/vslock.9#3 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#11 integrate .. //depot/projects/mips/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/mips/share/syscons/keymaps/Makefile#8 integrate .. //depot/projects/mips/share/syscons/keymaps/ru.koi8-r.win.kbd#1 branch .. //depot/projects/mips/share/termcap/termcap.src#7 integrate .. //depot/projects/mips/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#12 integrate .. //depot/projects/mips/sys/alpha/include/_types.h#4 integrate .. //depot/projects/mips/sys/alpha/isa/isa.c#5 integrate .. //depot/projects/mips/sys/alpha/linux/linux_proto.h#6 integrate .. //depot/projects/mips/sys/alpha/linux/linux_syscall.h#6 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysent.c#6 integrate .. //depot/projects/mips/sys/alpha/linux/syscalls.master#6 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_misc.c#9 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/mips/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/mips/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/mips/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/mips/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/mips/sys/amd64/include/_types.h#2 integrate .. //depot/projects/mips/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/mips/sys/amd64/isa/isa.c#4 integrate .. //depot/projects/mips/sys/arm/include/_types.h#3 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/mips/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/mips/sys/conf/NOTES#25 integrate .. //depot/projects/mips/sys/conf/files#29 integrate .. //depot/projects/mips/sys/conf/files.alpha#10 integrate .. //depot/projects/mips/sys/conf/files.amd64#6 integrate .. //depot/projects/mips/sys/conf/files.i386#23 integrate .. //depot/projects/mips/sys/conf/files.ia64#14 integrate .. //depot/projects/mips/sys/conf/files.pc98#21 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#16 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/mips/sys/conf/options#25 integrate .. //depot/projects/mips/sys/conf/options.i386#16 integrate .. //depot/projects/mips/sys/conf/options.pc98#15 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/CHANGES.txt#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acconfig.h#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acglobal.h#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acmacros.h#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acobject.h#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actbl2.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actypes.h#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acutils.h#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/amlcode.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbexec.c#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsmethod.c#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/excreate.c#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exmutex.c#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsaccess.c#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsalloc.c#7 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/psparse.c#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/psscope.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/uteval.c#6 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utglobal.c#7 integrate .. //depot/projects/mips/sys/contrib/dev/oltr/if_oltr.c#8 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/mips/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/mips/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_resource.c#4 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/mips/sys/dev/adlink/adlink.c#6 integrate .. //depot/projects/mips/sys/dev/advansys/adv_eisa.c#5 integrate .. //depot/projects/mips/sys/dev/advansys/adv_isa.c#5 integrate .. //depot/projects/mips/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/mips/sys/dev/advansys/adw_pci.c#5 integrate .. //depot/projects/mips/sys/dev/aha/aha_isa.c#6 integrate .. //depot/projects/mips/sys/dev/aha/aha_mca.c#6 integrate .. //depot/projects/mips/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/mips/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/mips/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/mips/sys/dev/aic/aic_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahc_pci.c#7 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/mips/sys/dev/amd/amd.c#6 integrate .. //depot/projects/mips/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#14 integrate .. //depot/projects/mips/sys/dev/ar/if_ar.c#8 integrate .. //depot/projects/mips/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/mips/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/mips/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/mips/sys/dev/asr/asr.c#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/mips/sys/dev/ata/ata-cbus.c#7 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/mips/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.c#13 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/mips/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/mips/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/mips/sys/dev/awi/awi.c#8 integrate .. //depot/projects/mips/sys/dev/awi/if_awi_pccard.c#7 integrate .. //depot/projects/mips/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_os.c#10 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_eisa.c#5 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_isa.c#5 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_mca.c#5 integrate .. //depot/projects/mips/sys/dev/buslogic/bt_pci.c#5 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#14 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/mips/sys/dev/cm/smc90cx6.c#7 integrate .. //depot/projects/mips/sys/dev/cnw/if_cnw.c#8 integrate .. //depot/projects/mips/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/mips/sys/dev/ct/ct_isa.c#5 integrate .. //depot/projects/mips/sys/dev/digi/digi_pci.c#3 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_isa.c#5 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_pci.c#5 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_scsi.c#10 integrate .. //depot/projects/mips/sys/dev/drm/drm_irq.h#3 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/mips/sys/dev/em/if_em.c#13 integrate .. //depot/projects/mips/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/mips/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/mips/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/mips/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/mips/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/mips/sys/dev/fe/if_fe.c#8 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#17 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/mips/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/mips/sys/dev/gem/if_gem_pci.c#7 integrate .. //depot/projects/mips/sys/dev/gfb/gfb_pci.c#7 integrate .. //depot/projects/mips/sys/dev/gx/if_gx.c#9 integrate .. //depot/projects/mips/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/mips/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/mips/sys/dev/hifn/hifn7751.c#11 integrate .. //depot/projects/mips/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/mips/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/mips/sys/dev/hme/if_hme_sbus.c#5 integrate .. //depot/projects/mips/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/mips/sys/dev/ida/ida_eisa.c#7 integrate .. //depot/projects/mips/sys/dev/ida/ida_pci.c#7 integrate .. //depot/projects/mips/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/mips/sys/dev/ie/if_ie.c#8 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/mips/sys/dev/iir/iir.h#6 integrate .. //depot/projects/mips/sys/dev/iir/iir_pci.c#6 integrate .. //depot/projects/mips/sys/dev/ips/ips.h#5 integrate .. //depot/projects/mips/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/mips/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/mips/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/mips/sys/dev/joy/joy.c#5 integrate .. //depot/projects/mips/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_cbus.c#5 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_isa.c#5 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_pci.c#6 integrate .. //depot/projects/mips/sys/dev/matcd/matcd_isa.c#2 integrate .. //depot/projects/mips/sys/dev/mcd/mcd_isa.c#6 integrate .. //depot/projects/mips/sys/dev/md/md.c#22 integrate .. //depot/projects/mips/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/mips/sys/dev/mlx/mlx_pci.c#5 integrate .. //depot/projects/mips/sys/dev/mly/mly.c#12 integrate .. //depot/projects/mips/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/mips/sys/dev/musycc/musycc.c#7 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#12 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500_pccard.c#7 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/mips/sys/dev/nsp/nsp_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/mips/sys/dev/pccard/pccard.c#11 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/mips/sys/dev/pci/isa_pci.c#4 integrate .. //depot/projects/mips/sys/dev/pcic/i82365.c#5 integrate .. //depot/projects/mips/sys/dev/pcic/i82365_isa.c#3 integrate .. //depot/projects/mips/sys/dev/pdq/if_fea.c#4 integrate .. //depot/projects/mips/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/mips/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/mips/sys/dev/ppbus/lpbb.c#3 integrate .. //depot/projects/mips/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/mips/sys/dev/ppbus/pcfclock.c#7 integrate .. //depot/projects/mips/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/mips/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/mips/sys/dev/ppbus/vpo.c#8 integrate .. //depot/projects/mips/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/mips/sys/dev/pst/pst-pci.c#5 integrate .. //depot/projects/mips/sys/dev/puc/puc.c#7 integrate .. //depot/projects/mips/sys/dev/raidframe/rf_acctrace.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_alloclist.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_aselect.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_callback.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_chaindecluster.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_copyback.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_cvscan.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagdegrd.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagdegwr.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagffrd.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagffwr.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagfuncs.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagutils.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_debugMem.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_debugprint.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_decluster.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_declusterPQ.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_diskqueue.c#4 delete .. //depot/projects/mips/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_disks.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_driver.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_engine.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd_dagfuncs.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd_dags.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_fifo.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_freebsdkintf.c#10 delete .. //depot/projects/mips/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_geniq.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_interdecluster.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_invertq.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_layout.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_map.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_mcpair.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_memchunk.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_nwayxor.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_options.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylog.c#4 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylogDiskMgr.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylogging.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_parityloggingdags.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_parityscan.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pq.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pqdeg.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pqdegdags.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_psstatus.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid0.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid1.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid4.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid5.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid5_rotatedspare.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconbuffer.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconmap.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconstruct.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconutil.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_revent.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_shutdown.c#5 delete .. //depot/projects/mips/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_sstf.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_states.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_stripelocks.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/mips/sys/dev/raidframe/rf_strutils.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_threadstuff.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_threadstuff.h#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_types.h#4 delete .. //depot/projects/mips/sys/dev/raidframe/rf_utils.c#3 delete .. //depot/projects/mips/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/mips/sys/dev/ray/if_ray.c#9 integrate .. //depot/projects/mips/sys/dev/rc/rc.c#8 integrate .. //depot/projects/mips/sys/dev/re/if_re.c#4 integrate .. //depot/projects/mips/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/mips/sys/dev/sab/sab.c#12 integrate .. //depot/projects/mips/sys/dev/safe/safe.c#3 integrate .. //depot/projects/mips/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/mips/sys/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/mips/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/mips/sys/dev/scd/scd_isa.c#4 integrate .. //depot/projects/mips/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/mips/sys/dev/si/si_isa.c#4 integrate .. //depot/projects/mips/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio.c#13 integrate .. //depot/projects/mips/sys/dev/sn/if_sn.c#9 integrate .. //depot/projects/mips/sys/dev/snc/if_snc.c#3 integrate .. //depot/projects/mips/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/mips/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/mips/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/mips/sys/dev/sound/isa/gusmidi.c#2 integrate .. //depot/projects/mips/sys/dev/sound/isa/mpu.c#3 integrate .. //depot/projects/mips/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/mips/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/mips/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/mips/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/mips/sys/dev/sound/isa/uartsio.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/mips/sys/dev/sound/pci/aureal.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/mips/sys/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/mips/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/mips/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/t4dwave.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pci/via8233.c#9 integrate .. //depot/projects/mips/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/mips/sys/dev/sr/if_sr.c#9 integrate .. //depot/projects/mips/sys/dev/stg/tmc18c30_subr.c#3 integrate .. //depot/projects/mips/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/mips/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/mips/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/mips/sys/dev/trm/trm.c#11 integrate .. //depot/projects/mips/sys/dev/twe/twe_freebsd.c#11 integrate .. //depot/projects/mips/sys/dev/tx/if_tx.c#10 integrate .. //depot/projects/mips/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/mips/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/mips/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/mips/sys/dev/uart/uart_subr.c#1 branch .. //depot/projects/mips/sys/dev/ubsec/ubsec.c#12 integrate .. //depot/projects/mips/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/mips/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/mips/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/mips/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#9 integrate .. //depot/projects/mips/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/mips/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#21 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#21 integrate .. //depot/projects/mips/sys/dev/vinum/vinumobj.h#3 integrate .. //depot/projects/mips/sys/dev/vinum/vinumrequest.c#9 integrate .. //depot/projects/mips/sys/dev/vinum/vinumvar.h#5 integrate .. //depot/projects/mips/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/mips/sys/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#15 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/mips/sys/dev/wl/if_wl.c#9 integrate .. //depot/projects/mips/sys/dev/xe/if_xe.c#9 integrate .. //depot/projects/mips/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/mips/sys/dev/zs/zs_sbus.c#5 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#22 integrate .. //depot/projects/mips/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/mips/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/mips/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/mips/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/mips/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#24 integrate .. //depot/projects/mips/sys/i386/i386/elan-mmcr.c#11 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/mips/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/mips/sys/i386/include/_types.h#6 integrate .. //depot/projects/mips/sys/i386/include/gsc.h#2 delete .. //depot/projects/mips/sys/i386/include/spigot.h#2 delete .. //depot/projects/mips/sys/i386/isa/README.le#2 delete .. //depot/projects/mips/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/mips/sys/i386/isa/gsc.c#6 delete .. //depot/projects/mips/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/mips/sys/i386/isa/ic/lemac.h#2 delete .. //depot/projects/mips/sys/i386/isa/ic/scd1400.h#2 delete .. //depot/projects/mips/sys/i386/isa/if_el.c#7 integrate .. //depot/projects/mips/sys/i386/isa/if_le.c#10 delete .. //depot/projects/mips/sys/i386/isa/if_rdp.c#10 delete .. //depot/projects/mips/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/isa.c#3 integrate .. //depot/projects/mips/sys/i386/isa/isa_compat.c#3 delete .. //depot/projects/mips/sys/i386/isa/isa_device.h#3 delete .. //depot/projects/mips/sys/i386/isa/mse.c#7 integrate .. //depot/projects/mips/sys/i386/isa/pcf.c#4 integrate .. //depot/projects/mips/sys/i386/isa/spic.c#7 integrate .. //depot/projects/mips/sys/i386/isa/spigot.c#7 delete .. //depot/projects/mips/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/mips/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/mips/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/mips/sys/i4b/capi/iavc/iavc_isa.c#3 integrate .. //depot/projects/mips/sys/i4b/capi/iavc/iavc_pci.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_ctx_s0P.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<