From owner-p4-projects@FreeBSD.ORG Mon Aug 11 10:10:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C389137B404; Mon, 11 Aug 2003 10:10:35 -0700 (PDT) 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 794FA37B401 for ; Mon, 11 Aug 2003 10:10:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A4E043FA3 for ; Mon, 11 Aug 2003 10:10:35 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7BHAY0U054072 for ; Mon, 11 Aug 2003 10:10:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7BHAYqL054069 for perforce@freebsd.org; Mon, 11 Aug 2003 10:10:34 -0700 (PDT) Date: Mon, 11 Aug 2003 10:10:34 -0700 (PDT) Message-Id: <200308111710.h7BHAYqL054069@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 35929 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, 11 Aug 2003 17:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=35929 Change 35929 by jhb@jhb_laptop on 2003/08/11 10:10:25 Call pmap_deactivate() before Lcs1 so cpu_throw doesn't call it. Reported by: marcel Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/swtch.s#6 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/swtch.s#6 (text+ko) ==== @@ -126,22 +126,7 @@ mov a0, s0 /* s0 = old curthread */ mov a2, s1 /* s1 = old pcb */ -sw1: - br pv, Lcs1 -Lcs1: LDGP(pv) - mov a1, s2 /* s2 = new thread */ - ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ - -#ifdef SMP /* - * Save fp state if we have some. - */ - mov s0, a0 /* curthread */ - ldiq a1, 1 /* clear fpcurthread */ - CALL(alpha_fpstate_save) -#endif - - /* * Deactivate the old address space before activating the * new one. We need to do this before activating the * new thread's address space in the event that new @@ -155,12 +140,24 @@ * taken care of calling pmap_deactivate() in cpu_exit(), * before the vmspace went away. */ - beq s0, Lcs6 + beq a0, sw1 + CALL(pmap_deactivate) /* pmap_deactivate(oldthread) */ + +sw1: + br pv, Lcs1 +Lcs1: LDGP(pv) + mov a1, s2 /* s2 = new thread */ + ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ - mov s0, a0 /* pmap_deactivate(oldthread) */ - CALL(pmap_deactivate) /* XXXKSE */ +#ifdef SMP + /* + * Save fp state if we have some. + */ + mov s0, a0 /* curthread */ + ldiq a1, 1 /* clear fpcurthread */ + CALL(alpha_fpstate_save) +#endif -Lcs6: /* * Activate the new thread's address space and perform * the actual context swap. @@ -172,8 +169,6 @@ mov s3, a0 /* swap the context */ SWITCH_CONTEXT -Lcs7: - /* * Now that the switch is done, update curthread and other * globals. From owner-p4-projects@FreeBSD.ORG Mon Aug 11 13:01:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 837D637B404; Mon, 11 Aug 2003 13:01:06 -0700 (PDT) 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 1266437B401 for ; Mon, 11 Aug 2003 13:01:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97A4043FA3 for ; Mon, 11 Aug 2003 13:01:05 -0700 (PDT) (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.6/8.12.6) with ESMTP id h7BK150U067938 for ; Mon, 11 Aug 2003 13:01:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7BK15bn067935 for perforce@freebsd.org; Mon, 11 Aug 2003 13:01:05 -0700 (PDT) Date: Mon, 11 Aug 2003 13:01:05 -0700 (PDT) Message-Id: <200308112001.h7BK15bn067935@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 35937 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, 11 Aug 2003 20:01:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=35937 Change 35937 by rwatson@rwatson_tislabs on 2003/08/11 13:00:06 Add mac_test and mac_stub cases for two MAC-branch specific entry points: mpo_check_proc_wait() and mpo_update_mbuf_from_cipso(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#2 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#110 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#2 (text+ko) ==== @@ -416,6 +416,14 @@ } +static int +stub_update_mbuf_from_cipso(struct mbuf *m, struct label *mlabel, + struct ifnet *ifnet, struct label *ifnetlabel, char *cp, int *code) +{ + + return (0); +} + /* * Labeling event operations: processes. */ @@ -636,6 +644,13 @@ } static int +stub_check_proc_wait(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int stub_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -1074,6 +1089,7 @@ .mpo_reflect_mbuf_tcp = stub_reflect_mbuf_tcp, .mpo_relabel_ifnet = stub_relabel_ifnet, .mpo_update_ipq = stub_update_ipq, + .mpo_update_mbuf_from_cipso = stub_update_mbuf_from_cipso, .mpo_create_cred = stub_create_cred, .mpo_execve_transition = stub_execve_transition, .mpo_execve_will_transition = stub_execve_will_transition, @@ -1103,6 +1119,7 @@ .mpo_check_proc_debug = stub_check_proc_debug, .mpo_check_proc_sched = stub_check_proc_sched, .mpo_check_proc_signal = stub_check_proc_signal, + .mpo_check_proc_wait = stub_check_proc_wait, .mpo_check_socket_bind = stub_check_socket_bind, .mpo_check_socket_connect = stub_check_socket_connect, .mpo_check_socket_deliver = stub_check_socket_deliver, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#110 (text+ko) ==== @@ -932,6 +932,17 @@ ASSERT_IPQ_LABEL(ipqlabel); } +static int +mac_test_update_mbuf_from_cipso(struct mbuf *m, struct label *mlabel, + struct ifnet *ifnet, struct label *ifnetlabel, char *cp, int *code) +{ + + ASSERT_MBUF_LABEL(mlabel); + ASSERT_IFNET_LABEL(ifnetlabel); + + return (0); +} + /* * Labeling event operations: processes. */ @@ -1252,6 +1263,16 @@ } static int +mac_test_check_proc_wait(struct ucred *cred, struct proc *proc) +{ + + ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_CRED_LABEL(&proc->p_ucred->cr_label); + + return (0); +} + +static int mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -1843,6 +1864,7 @@ .mpo_reflect_mbuf_icmp = mac_test_reflect_mbuf_tcp, .mpo_relabel_ifnet = mac_test_relabel_ifnet, .mpo_update_ipq = mac_test_update_ipq, + .mpo_update_mbuf_from_cipso = mac_test_update_mbuf_from_cipso, .mpo_create_cred = mac_test_create_cred, .mpo_execve_transition = mac_test_execve_transition, .mpo_execve_will_transition = mac_test_execve_will_transition, @@ -1872,6 +1894,7 @@ .mpo_check_proc_debug = mac_test_check_proc_debug, .mpo_check_proc_sched = mac_test_check_proc_sched, .mpo_check_proc_signal = mac_test_check_proc_signal, + .mpo_check_proc_wait = mac_test_check_proc_wait, .mpo_check_socket_bind = mac_test_check_socket_bind, .mpo_check_socket_connect = mac_test_check_socket_connect, .mpo_check_socket_deliver = mac_test_check_socket_deliver, From owner-p4-projects@FreeBSD.ORG Mon Aug 11 21:30:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41B8137B404; Mon, 11 Aug 2003 21:30:44 -0700 (PDT) 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 D0C1037B401 for ; Mon, 11 Aug 2003 21:30:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9910343F85 for ; Mon, 11 Aug 2003 21:30:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7C4Ug0U005711 for ; Mon, 11 Aug 2003 21:30:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7C4Uf2M005708 for perforce@freebsd.org; Mon, 11 Aug 2003 21:30:41 -0700 (PDT) Date: Mon, 11 Aug 2003 21:30:41 -0700 (PDT) Message-Id: <200308120430.h7C4Uf2M005708@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 35960 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, 12 Aug 2003 04:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=35960 Change 35960 by marcel@marcel_nfs on 2003/08/11 21:30:14 IFC @35959 Affected files ... .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#11 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/dispatch.c#5 integrate .. //depot/projects/ia64/contrib/isc-dhcp/includes/dhcpd.h#9 integrate .. //depot/projects/ia64/etc/network.subr#8 integrate .. //depot/projects/ia64/etc/pccard_ether#9 integrate .. //depot/projects/ia64/etc/sendmail/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#5 integrate .. //depot/projects/ia64/lib/Makefile#34 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/fpgetmask.c#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/fpsetmask.c#3 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#15 integrate .. //depot/projects/ia64/lib/libc/locale/big5.5#1 branch .. //depot/projects/ia64/lib/libc/locale/gb18030.5#1 branch .. //depot/projects/ia64/lib/libc/locale/gbk.5#1 branch .. //depot/projects/ia64/lib/libc/locale/mskanji.5#1 branch .. //depot/projects/ia64/lib/libc/locale/multibyte.3#8 integrate .. //depot/projects/ia64/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc/stdlib/random.c#4 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/libc/sys/mlockall.2#1 branch .. //depot/projects/ia64/lib/libc/sys/ptrace.2#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_fork.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#15 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#29 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rtld.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#21 integrate .. //depot/projects/ia64/release/Makefile#69 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#24 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#116 integrate .. //depot/projects/ia64/release/sparc64/mkisoimages.sh#3 integrate .. //depot/projects/ia64/sbin/atm/atm/atm.c#4 integrate .. //depot/projects/ia64/sbin/dhclient/Makefile.inc#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#55 integrate .. //depot/projects/ia64/share/man/man4/ng_atmpif.4#1 branch .. //depot/projects/ia64/share/man/man5/Makefile#14 integrate .. //depot/projects/ia64/share/man/man5/nsmb.conf.5#1 branch .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#24 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/ia64/sys/conf/NOTES#62 integrate .. //depot/projects/ia64/sys/conf/files#92 integrate .. //depot/projects/ia64/sys/conf/options#62 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_button.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#8 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/ia64/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx.c#11 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#16 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#32 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/ia64/sys/dev/smbus/smb.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.h#3 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#55 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#8 integrate .. //depot/projects/ia64/sys/i386/isa/spigot.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#88 integrate .. //depot/projects/ia64/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#61 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#33 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#20 integrate .. //depot/projects/ia64/sys/ia64/include/ieeefp.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/pcb.h#9 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#65 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_param.c#11 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#38 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#23 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#38 integrate .. //depot/projects/ia64/sys/libkern/random.c#4 integrate .. //depot/projects/ia64/sys/modules/Makefile#58 integrate .. //depot/projects/ia64/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/netgraph/atm/atmpif/Makefile#1 branch .. //depot/projects/ia64/sys/netgraph/atm/atmpif/ng_atmpif.c#1 branch .. //depot/projects/ia64/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch .. //depot/projects/ia64/sys/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/atm/ng_atmpif.h#1 branch .. //depot/projects/ia64/sys/pci/if_rl.c#40 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/ia64/sys/pci/meteor.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#44 integrate .. //depot/projects/ia64/sys/sys/mman.h#7 integrate .. //depot/projects/ia64/sys/sys/pipe.h#7 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#49 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#15 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#33 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#27 integrate .. //depot/projects/ia64/sys/vm/vm_kern.h#4 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_map.h#24 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_unix.c#7 integrate .. //depot/projects/ia64/usr.bin/mklocale/mklocale.1#7 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/advcap.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#9 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/dump.c#4 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/if.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rrenum.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/timer.c#4 integrate .. //depot/projects/ia64/usr.sbin/rtsold/dump.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtsold/if.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtsold/probe.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtsold/rtsold.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#21 integrate Differences ... ==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright[] = "$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.30 2003/08/07 14:58:46 mbr Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.32 2003/08/10 22:01:37 mbr Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -263,7 +263,7 @@ /* Init some interface vars, enable polling */ #ifdef ENABLE_POLLING_MODE tmp -> forcediscover = 0; - tmp -> linkstate = 0; + tmp -> linkstate = HAVELINK; tmp -> polling = 1; #endif /* ifdef ENABLE_POLLING_MODE */ @@ -423,12 +423,13 @@ #ifdef __FreeBSD__ set_ieee80211 (ip); #endif +#ifdef ENABLE_POLLING_MODE ip -> forcediscover = 0; if (ip -> client -> config -> media != NULL) ip -> havemedia = 1; else ip -> havemedia = 0; - +#endif script_init (ip -> client, "PREINIT", (struct string_list *)0); if (ip -> client -> alias) @@ -472,8 +473,8 @@ /* Set up a timeout to start the initialization process. */ #ifdef ENABLE_POLLING_MODE - add_timeout (cur_time + random () % 5, - state_link, client, 0, 0); + add_timeout (cur_time + random () % 5 + 2, + state_polling, client, 0, 0); #else add_timeout (cur_time + random () % 5, state_reboot, client, 0, 0); @@ -1460,9 +1461,6 @@ } } - if (interface_active (client -> interface) == NOLINK) - return; - /* If we're supposed to increase the interval, do so. If it's currently zero (i.e., we haven't sent any packets yet), set it to one; otherwise, add to it a random number between @@ -1529,7 +1527,7 @@ struct client_lease *loop; struct client_lease *lp; - if (interface_active (client -> interface) == NOLINK) + if (client -> interface -> linkstate == NOLINK) return; loop = lp = client -> active; @@ -1565,7 +1563,7 @@ (long)(client -> active -> renewal - cur_time), "seconds"); #ifdef ENABLE_POLLING_MODE - /* Enable polling for thsi interface */ + /* Enable polling for this interface */ client -> interface -> polling = 1; #endif add_timeout (client -> active -> renewal, @@ -2859,9 +2857,10 @@ case S_STOPPED: break; } +#ifndef ENABLE_POLLING_MODE client -> state = S_INIT; - if (interface_active (ip) == HAVELINK) - state_reboot (client); + state_reboot (client); +#endif } } } @@ -3022,10 +3021,8 @@ client -> state = S_INIT; /* Set up a timeout to start the initialization process. */ - if (interface_active (ip) == HAVELINK) { - add_timeout (cur_time + random () % 5, - state_reboot, client, 0, 0); - } + add_timeout (cur_time + random () % 5, + state_reboot, client, 0, 0); } } return ISC_R_SUCCESS; @@ -3089,8 +3086,9 @@ break; case server_awaken: - if (interface_active (ip) == HAVELINK) - state_reboot (client); +#ifndef ENABLE_POLLING_MODE + state_reboot (client); +#endif break; } } @@ -3271,44 +3269,29 @@ */ if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) && (ifmr.ifm_status & IFM_ACTIVE)) { - if (ip -> havemedia && - ip -> client -> state != S_BOUND) - ip -> forcediscover = 1; return (HAVELINK); } } else { - /* - * Media settings can also be possible for normal - * devices. - */ if (ifmr.ifm_status & IFM_ACTIVE) { - if (ip -> havemedia && - ip -> client -> state != S_BOUND) - ip -> forcediscover = 1; return (HAVELINK); } } + /* + * We really have no link. + */ + return (NOLINK); } - /* - * If dhclient.conf contains media settings, we cannot - * abort if the interface is not set to active mode. + * IFM_AVALID is not set. We cannot check + * the link state. Assume HAVELINK. */ - if (ip -> havemedia && ip -> client -> state != S_BOUND) - return (HAVELINK); - /* - * We really have no link. - */ - return (NOLINK); -#else /* ifdef __FreeBSD__ */ - +#endif /* Other OSs */ /* * Always return a successful link if the OS * is not supported. */ return (HAVELINK); -#endif /* Other OSs */ } #ifdef __FreeBSD__ @@ -3357,11 +3340,12 @@ } /* Check the state of the NICs if we have link */ -void state_link (cpp) +void state_polling (cpp) void *cpp; { struct interface_info *ip; struct client_state *client; + int result; for (ip = interfaces; ip; ip = ip -> next) { if (! ip -> polling) @@ -3375,7 +3359,18 @@ } #endif + result = interface_active (ip); /* + * If dhclient.conf contains media settings, we cannot + * abort if the interface is not set to active mode. + */ + if (ip -> havemedia && ip -> client -> state != S_BOUND) { + if (result == HAVELINK) + ip -> forcediscover = 1; + result = HAVELINK; + } + + /* * The last status of the interface tells us * the we've got no link ... */ @@ -3384,7 +3379,7 @@ * ... but we have now link. Let's send * requests. */ - if (interface_active (ip) == HAVELINK) { + if (result == HAVELINK) { #ifdef DEBUG if (ip -> havemedia) printf ("%s: Trying media settings on interface\n", @@ -3408,7 +3403,7 @@ ip -> linkstate = HAVELINK; } else { #ifdef DEBUG - printf ("%s: No Link on interface\n", ip -> name); + printf ("%s: No link on interface\n", ip -> name); #endif for (client = ip -> client; client; client = client -> next) { @@ -3423,7 +3418,7 @@ */ if (client -> state == S_INIT) { add_timeout (cur_time + (polling_interval + 1), - state_link, client, 0, 0); + state_polling, client, 0, 0); } } ip -> linkstate = NOLINK; @@ -3444,7 +3439,7 @@ * the we previously had link. */ if (ip -> linkstate == HAVELINK && doinitcheck) { - if (interface_active (ip) == NOLINK) { + if (result == NOLINK) { /* * We lost link on the interface, or it isn't * associated anymore. ==== //depot/projects/ia64/contrib/isc-dhcp/common/dispatch.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: dispatch.c,v 1.63.2.3 2002/11/17 02:26:57 dhankins Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/common/dispatch.c,v 1.3 2003/07/28 11:49:07 mbr Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/common/dispatch.c,v 1.4 2003/08/10 22:01:37 mbr Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -115,7 +115,7 @@ tvp = process_outstanding_timeouts (&tv); #ifdef ENABLE_POLLING_MODE GET_TIME (&cur_time); - add_timeout(cur_time + polling_interval, state_link, 0, 0, 0); + add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0); tvp_new = process_outstanding_timeouts(&tv); if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec)) tvp = tvp_new; ==== //depot/projects/ia64/contrib/isc-dhcp/includes/dhcpd.h#9 (text+ko) ==== @@ -40,7 +40,7 @@ * see ``http://www.vix.com''. To learn more about Nominum, Inc., see * ``http://www.nominum.com''. * - * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.6 2003/08/07 14:58:46 mbr Exp $ + * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.7 2003/08/10 22:01:37 mbr Exp $ */ #ifndef __CYGWIN32__ @@ -1864,7 +1864,7 @@ void state_reboot PROTO ((void *)); #ifdef ENABLE_POLLING_MODE -void state_link PROTO (()); +void state_polling PROTO (()); void state_background PROTO ((void *)); #endif void state_init PROTO ((void *)); ==== //depot/projects/ia64/etc/network.subr#8 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.152 2003/08/08 17:43:58 ume Exp $ +# $FreeBSD: src/etc/network.subr,v 1.153 2003/08/11 20:32:00 mbr Exp $ # # @@ -299,6 +299,24 @@ esac done + case ${pccard_ifconfig} in + [Dd][Hh][Cc][Pp]) + for _if in ${removable_interfaces} ; do + _test_if=`ifconfig ${_if} 2>&1` + case "$_test_if" in + "ifconfig: interface $_if does not exist") + ;; + *) + _dhcplist="${_dhcplist}${_aprefix}${_if}" + [ -z "$_aprefix" ] && _aprefix=' ' + ;; + esac + done + ;; + *) + ;; + esac + case "$type" in nodhcp) echo $_nodhcplist ==== //depot/projects/ia64/etc/pccard_ether#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.32 2003/06/16 09:11:29 maxim Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.33 2003/08/11 20:32:00 mbr Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -12,11 +12,40 @@ pidfile="/var/run/dhclient.${interface}.pid" elif [ -s /var/run/dhcpc.${interface}.pid ]; then pidfile="/var/run/dhcpc.${interface}.pid" + elif [ -s /var/run/dhclient.pid ]; then + # If dhclient is already running, record + # it's interfaces. + if [ -x /usr/bin/grep ]; then + eval _active_list=\"`/bin/ps -axwww | \ + /usr/bin/grep dhclient | \ + /usr/bin/grep -v grep | \ + /usr/bin/sed -e 's|^.*dhclient||' | \ + /usr/bin/awk '{for (i=1;i<=NF;i++) \ + { if ($i~/[a-zA-Z].[0-9]$/) \ + { printf(" %s",$i) } }}'` \ + \" + fi + + _aprefix= + for _if in _active_list ; do + _test_if=`ifconfig ${_if} 2>&1` + case "$_test_if" in + "ifconfig: interface $_if does not exist") + ;; + *) + _dhcplist="${_dhcplist}${_aprefix}${_if}" + [ -z "$_aprefix" ] && _aprefix=' ' + ;; + esac + done + + pidfile="/var/run/dhclient.pid" else return fi kill `cat ${pidfile}` rm -f ${pidfile} + sh `/etc/rc.d/dhclient start` } start_dhcp() { @@ -35,7 +64,7 @@ pidfile="/var/run/dhclient.${interface}.pid" dhclient_flags="${dhclient_flags} -pf ${pidfile}" fi - ${dhclient_program} ${dhclient_flags} ${interface} + ${dhclient_program} ${dhclient_flags} $_dhcplist ${interface} else echo "${dhclient_program}: DHCP client software not available" fi ==== //depot/projects/ia64/etc/sendmail/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 -# $FreeBSD: src/etc/sendmail/Makefile,v 1.26 2003/07/10 04:53:32 gshapiro Exp $ +# $FreeBSD: src/etc/sendmail/Makefile,v 1.27 2003/08/10 20:48:59 gshapiro Exp $ M4= m4 CHMOD= chmod @@ -60,7 +60,7 @@ all: ${ALL} -install distribution: ${ALL} +install distribution: .if defined(SENDMAIL_MC) && defined(SENDMAIL_CF) @echo ">>> ERROR: Both SENDMAIL_MC and SENDMAIL_CF cannot be set" @false ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#5 (text+ko) ==== @@ -20,7 +20,7 @@ # along with GNU GNATS; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # -# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.31 2003/03/18 11:12:14 des Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.33 2003/08/11 19:41:14 ceri Exp $ # The version of this send-pr. VERSION=3.113 ==== //depot/projects/ia64/lib/Makefile#34 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.167 2003/08/08 21:16:06 deischen Exp $ +# $FreeBSD: src/lib/Makefile,v 1.168 2003/08/09 15:29:52 deischen Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -63,15 +63,6 @@ _libncp= libncp _libsmb= libsmb _libvgl= libvgl -.if !defined(NOLIBPTHREAD) -_libpthread= libpthread -.endif -.endif - -.if ${MACHINE_ARCH} == "ia64" -.if !defined(NOLIBPTHREAD) -_libpthread= libpthread -.endif .endif .if ${MACHINE_ARCH} == "alpha" @@ -82,6 +73,9 @@ .if ${MACHINE_ARCH} == "amd64" _libncp= libncp _libsmb= libsmb +.endif + +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "sparc64" .if !defined(NOLIBPTHREAD) _libpthread= libpthread .endif ==== //depot/projects/ia64/lib/libc/alpha/sys/Makefile.inc#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/lib/libc/alpha/sys/Makefile.inc,v 1.11 2002/05/23 23:51:56 jake Exp $ +# $FreeBSD: src/lib/libc/alpha/sys/Makefile.inc,v 1.12 2003/08/11 07:14:06 bms Exp $ MDASM+= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \ sbrk.S setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,12 +1,12 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.26 2003/04/30 18:17:07 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.27 2003/08/11 07:14:06 bms Exp $ MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.26 2003/08/11 07:14:06 bms Exp $ SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c @@ -9,7 +9,7 @@ # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/ia64/gen/fpgetmask.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpgetmask.c,v 1.2 2002/03/22 21:52:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpgetmask.c,v 1.3 2003/08/09 17:07:24 marcel Exp $"); #include #include @@ -36,5 +36,5 @@ u_int64_t fpsr; __asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr)); - return (fpsr & 0x1f) ^ 0x1f; + return (~fpsr & 0x3f); } ==== //depot/projects/ia64/lib/libc/ia64/gen/fpsetmask.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpsetmask.c,v 1.2 2002/03/22 21:52:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpsetmask.c,v 1.3 2003/08/09 17:07:24 marcel Exp $"); #include #include @@ -37,8 +37,8 @@ u_int64_t oldmask; __asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr)); - oldmask = (fpsr & 0x1f) ^ 0x1f; - fpsr = (fpsr & ~0x1f) | (mask ^ 0x1f); + oldmask = ~fpsr & 0x3f; + fpsr = (fpsr & ~0x3f) | (~mask & 0x3f); __asm __volatile("mov ar.fpsr=%0" :: "r" (fpsr)); - return oldmask; + return (oldmask); } ==== //depot/projects/ia64/lib/libc/ia64/sys/Makefile.inc#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.7 2003/08/02 00:49:36 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.8 2003/08/11 07:14:06 bms Exp $ MDASM+= Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \ sbrk.S setlogin.S sigreturn.S swapcontext.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/locale/Makefile.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.45 2003/07/29 07:52:44 ache Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.47 2003/08/10 11:34:35 tjr Exp $ # locale sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale @@ -31,7 +31,7 @@ wcsrtombs.3 wcstod.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 -MAN+= utf8.5 +MAN+= big5.5 gb18030.5 gbk.5 mskanji.5 utf8.5 MLINKS+=btowc.3 wctob.3 MLINKS+=isdigit.3 isnumber.3 ==== //depot/projects/ia64/lib/libc/locale/multibyte.3#8 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.19 2003/02/06 11:04:46 charnier Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.21 2003/08/10 11:38:28 tjr Exp $ .\" -.Dd October 6, 2002 +.Dd August 10, 2003 .Dt MULTIBYTE 3 .Os .Sh NAME @@ -226,6 +226,7 @@ .Xr mbrlen 3 , .Xr mbrtowc 3 , .Xr mbrune 3 , +.Xr mbsinit 3 , .Xr mbsrtowcs 3 , .Xr rune 3 , .Xr setlocale 3 , @@ -233,6 +234,10 @@ .Xr wcsrtombs 3 , .Xr euc 4 , .Xr utf2 4 , +.Xr big5 5 , +.Xr gb18030 5 , +.Xr gbk 5 , +.Xr mskanji 5 , .Xr utf8 5 .Sh STANDARDS The ==== //depot/projects/ia64/lib/libc/powerpc/sys/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.1 2002/12/04 07:25:14 grehan Exp $ +# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.2 2003/08/11 07:14:07 bms Exp $ MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.8 2002/09/03 14:55:29 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -16,7 +16,7 @@ # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + lseek.o mmap.o openbsd_poll.o pread.o \ pwrite.o setdomainname.o sstk.o truncate.o uname.o yield.o PSEUDO= _getlogin.o _exit.o ==== //depot/projects/ia64/lib/libc/stdlib/random.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)random.c 8.2 (Berkeley) 5/19/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.22 2003/02/04 11:24:08 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.23 2003/08/10 17:49:55 ache Exp $"); #include "namespace.h" #include /* for srandomdev() */ @@ -142,7 +142,11 @@ */ #define MAX_TYPES 5 /* max number of types above */ -#define NSHUFF 100 /* to drop part of seed -> 1st value correlation */ +#ifdef USE_WEAK_SEEDING +#define NSHUFF 0 +#else /* !USE_WEAK_SEEDING */ +#define NSHUFF 50 /* to drop some "seed -> 1st value" linearity */ +#endif /* !USE_WEAK_SEEDING */ static long degrees[MAX_TYPES] = { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 }; static long seps [MAX_TYPES] = { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 }; ==== //depot/projects/ia64/lib/libc/sys/Makefile.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.104 2003/08/09 03:23:24 bms Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.105 2003/08/11 07:14:07 bms Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -69,8 +69,8 @@ kldfind.2 kldfirstmod.2 kldload.2 kldnext.2 kldstat.2 kldsym.2 \ kldunload.2 kqueue.2 kse.2 ktrace.2 link.2 lio_listio.2 listen.2 \ lseek.2 \ - madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 mmap.2 \ - modfind.2 modnext.2 modstat.2 mount.2 \ + madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 \ + mlockall.2 mmap.2 modfind.2 modnext.2 modstat.2 mount.2 \ mprotect.2 msync.2 munmap.2 nanosleep.2 ntp_adjtime.2 ntp_gettime.2 \ nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ @@ -121,6 +121,7 @@ kse.2 kse_wakeup.2 kse.2 kse_thr_interrupt.2 MLINKS+=madvise.2 posix_madvise.2 MLINKS+=mlock.2 munlock.2 +MLINKS+=mlockall.2 munlockall.2 MLINKS+=modnext.2 modfnext.2 MLINKS+=mount.2 unmount.2 MLINKS+=pathconf.2 fpathconf.2 ==== //depot/projects/ia64/lib/libc/sys/ptrace.2#7 (text+ko) ==== @@ -1,8 +1,8 @@ -.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.31 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.32 2003/08/11 13:13:46 iedowse Exp $ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd January 20, 1996 +.Dd August 11, 2003 .Dt PTRACE 2 .Os .Sh NAME @@ -162,7 +162,8 @@ The .Fa data argument -is not used. +provides a signal number to be delivered to the traced process as it +resumes execution, or 0 if no signal is to be sent. .It Dv PT_KILL The traced process terminates, as if .Dv PT_CONTINUE ==== //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#13 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.27 2003/08/05 22:46:00 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.28 2003/08/10 22:07:28 davidxu Exp $ */ #include #include @@ -259,6 +259,8 @@ void _thr_enter_cancellation_point(struct pthread *thread) { + if (!_kse_isthreaded()) + return; /* Look for a cancellation before we block: */ THR_SCHED_LOCK(thread, thread); testcancel(thread); @@ -269,6 +271,8 @@ void _thr_leave_cancellation_point(struct pthread *thread) { + if (!_kse_isthreaded()) + return; THR_SCHED_LOCK(thread, thread); thread->cancelflags &= ~THR_AT_CANCEL_POINT; /* Look for a cancellation after we unblock: */ ==== //depot/projects/ia64/lib/libpthread/thread/thr_fork.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.30 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_fork.c,v 1.31 2003/08/10 22:20:41 davidxu Exp $ */ #include #include @@ -37,6 +37,7 @@ #include #include #include +#include #include "thr_private.h" __weak_reference(_fork, fork); @@ -44,15 +45,35 @@ pid_t _fork(void) { + sigset_t sigset, oldset; struct pthread *curthread; pid_t ret; + if (!_kse_isthreaded()) + return (__sys_fork()); + curthread = _get_curthread(); + /* + * Masks all signals until we reach a safe point in + * _kse_single_thread, and the signal masks will be + * restored in that function, for M:N thread, all + * signals were already masked in kernel atomically, + * we only need to do this for bound thread. + */ + if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) { + SIGFILLSET(sigset); + __sys_sigprocmask(SIG_SETMASK, &sigset, &oldset); + } /* Fork a new process: */ - if ((ret = __sys_fork()) == 0) + if ((ret = __sys_fork()) == 0) { /* Child process */ _kse_single_thread(curthread); + /* Kernel signal mask is restored in _kse_single_thread */ + } else { + if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) + __sys_sigprocmask(SIG_SETMASK, &oldset, NULL); + } /* Return the process ID: */ return (ret); ==== //depot/projects/ia64/lib/libpthread/thread/thr_init.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.58 2003/08/05 22:46:00 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.59 2003/08/10 22:30:20 davidxu Exp $ */ /* Allocate space for global thread variables here: */ @@ -309,8 +309,6 @@ _kcb_set(_thr_initial->kse->k_kcb); _tcb_set(_thr_initial->kse->k_kcb, _thr_initial->tcb); _thr_initial->kse->k_flags |= KF_INITIALIZED; - - _thr_rtld_init(); } /* ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.83 2003/08/08 22:20:59 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.84 2003/08/10 22:30:20 davidxu Exp $"); #include #include @@ -213,16 +213,17 @@ kse_critical_t crit; int i; - + if (__isthreaded) { + _thr_rtld_fini(); + _thr_signal_deinit(); + } + __isthreaded = 0; /* - * Disable upcalls and clear the threaded flag. - * XXX - I don't think we need to disable upcalls after a fork(). - * but it doesn't hurt. - */ - crit = _kse_critical_enter(); - __isthreaded = 0; + * Restore signal mask early, so any memory problems could + * dump core. + */ + sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); active_threads = 1; - _thr_signal_deinit(); /* * Enter a loop to remove and free all threads other than @@ -359,11 +360,18 @@ _kse_initial = NULL; _libpthread_init(curthread); #else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 11 21:35:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06C8437B404; Mon, 11 Aug 2003 21:35:53 -0700 (PDT) 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 AD4B137B401 for ; Mon, 11 Aug 2003 21:35:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F99A43F85 for ; Mon, 11 Aug 2003 21:35:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7C4Zp0U007246 for ; Mon, 11 Aug 2003 21:35:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7C4ZnEw007243 for perforce@freebsd.org; Mon, 11 Aug 2003 21:35:49 -0700 (PDT) Date: Mon, 11 Aug 2003 21:35:49 -0700 (PDT) Message-Id: <200308120435.h7C4ZnEw007243@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 35961 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, 12 Aug 2003 04:35:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=35961 Change 35961 by marcel@marcel_nfs on 2003/08/11 21:35:13 IFC @35959 Affected files ... .. //depot/projects/uart/alpha/alpha/critical.c#2 integrate .. //depot/projects/uart/alpha/alpha/pmap.c#7 integrate .. //depot/projects/uart/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/uart/alpha/include/critical.h#2 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/uart/amd64/amd64/critical.c#3 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#10 integrate .. //depot/projects/uart/amd64/include/critical.h#2 integrate .. //depot/projects/uart/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/uart/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/uart/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/uart/conf/NOTES#7 integrate .. //depot/projects/uart/conf/files#13 integrate .. //depot/projects/uart/conf/kern.post.mk#3 integrate .. //depot/projects/uart/conf/options#7 integrate .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslfiles.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslfold.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslglobal.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asllength.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asllisting.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslload.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asllookup.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmain.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmap.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopcodes.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asloperands.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopt.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslresource.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslrestype1.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslrestype2.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslstubs.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asltransform.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asltree.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/asltypes.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslutils.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/osunixxf.c#1 branch .. //depot/projects/uart/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/uart/dev/aac/aacvar.h#3 integrate .. //depot/projects/uart/dev/acpica/acpi.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/uart/dev/amd/amd.c#4 integrate .. //depot/projects/uart/dev/bge/if_bge.c#5 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/uart/dev/ct/ct.c#2 integrate .. //depot/projects/uart/dev/dgb/dgreg.h#2 integrate .. //depot/projects/uart/dev/digi/digi.c#2 integrate .. //depot/projects/uart/dev/digi/digi.h#2 integrate .. //depot/projects/uart/dev/digi/digireg.h#2 integrate .. //depot/projects/uart/dev/ed/if_ed.c#2 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/uart/dev/en/if_en_pci.c#2 integrate .. //depot/projects/uart/dev/en/midway.c#5 integrate .. //depot/projects/uart/dev/en/midwayvar.h#2 integrate .. //depot/projects/uart/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/uart/dev/fatm/if_fatmvar.h#3 integrate .. //depot/projects/uart/dev/firewire/firewire.c#5 integrate .. //depot/projects/uart/dev/firewire/firewire.h#3 integrate .. //depot/projects/uart/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/uart/dev/firewire/fwdev.c#4 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#6 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#6 integrate .. //depot/projects/uart/dev/hatm/if_hatm_ioctl.c#5 integrate .. //depot/projects/uart/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/uart/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/uart/dev/hatm/if_hatmvar.h#4 integrate .. //depot/projects/uart/dev/ida/ida_disk.c#2 integrate .. //depot/projects/uart/dev/ie/if_ievar.h#2 integrate .. //depot/projects/uart/dev/iicbus/iic.c#2 integrate .. //depot/projects/uart/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/uart/dev/md/md.c#3 integrate .. //depot/projects/uart/dev/mlx/mlx.c#3 integrate .. //depot/projects/uart/dev/mly/mly.c#3 integrate .. //depot/projects/uart/dev/patm/if_patm.c#3 integrate .. //depot/projects/uart/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/uart/dev/patm/if_patm_rx.c#3 integrate .. //depot/projects/uart/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/uart/dev/patm/if_patmvar.h#2 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#6 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#6 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/uart/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/uart/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/uart/dev/rc/rc.c#2 integrate .. //depot/projects/uart/dev/smbus/smb.c#2 integrate .. //depot/projects/uart/dev/snc/dp83932.c#2 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#5 integrate .. //depot/projects/uart/dev/sound/pci/ich.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/uart/dev/sym/sym_fw.h#2 integrate .. //depot/projects/uart/dev/trm/trm.c#3 integrate .. //depot/projects/uart/dev/twe/twe.c#2 integrate .. //depot/projects/uart/dev/twe/twe_compat.h#2 integrate .. //depot/projects/uart/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/uart/dev/twe/twe_tables.h#2 integrate .. //depot/projects/uart/dev/twe/tweio.h#2 integrate .. //depot/projects/uart/dev/twe/twereg.h#2 integrate .. //depot/projects/uart/dev/twe/twevar.h#2 integrate .. //depot/projects/uart/dev/usb/umass.c#4 integrate .. //depot/projects/uart/dev/wi/if_wi_pci.c#4 integrate .. //depot/projects/uart/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/uart/i386/i386/critical.c#2 integrate .. //depot/projects/uart/i386/i386/exception.s#2 integrate .. //depot/projects/uart/i386/i386/i686_mem.c#2 integrate .. //depot/projects/uart/i386/i386/identcpu.c#3 integrate .. //depot/projects/uart/i386/i386/pmap.c#9 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/uart/i386/i386/tsc.c#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/uart/i386/include/clock.h#2 integrate .. //depot/projects/uart/i386/include/cpufunc.h#3 integrate .. //depot/projects/uart/i386/include/critical.h#2 integrate .. //depot/projects/uart/i386/include/sysarch.h#2 integrate .. //depot/projects/uart/i386/isa/clock.c#2 integrate .. //depot/projects/uart/i386/isa/cxreg.h#2 integrate .. //depot/projects/uart/i386/isa/if_rdp.c#2 integrate .. //depot/projects/uart/i386/isa/spic.c#2 integrate .. //depot/projects/uart/i386/isa/spigot.c#2 integrate .. //depot/projects/uart/i386/isa/wt.c#2 integrate .. //depot/projects/uart/ia64/ia64/critical.c#2 integrate .. //depot/projects/uart/ia64/ia64/exception.S#4 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#7 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#7 integrate .. //depot/projects/uart/ia64/ia64/support.S#2 integrate .. //depot/projects/uart/ia64/ia64/syscall.S#3 integrate .. //depot/projects/uart/ia64/ia64/trap.c#4 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/uart/ia64/include/cpu.h#4 integrate .. //depot/projects/uart/ia64/include/critical.h#2 integrate .. //depot/projects/uart/ia64/include/ieeefp.h#2 integrate .. //depot/projects/uart/ia64/include/pcb.h#2 integrate .. //depot/projects/uart/ia64/include/ucontext.h#3 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/uart/kern/kern_descrip.c#6 integrate .. //depot/projects/uart/kern/kern_fork.c#2 integrate .. //depot/projects/uart/kern/kern_ktrace.c#3 integrate .. //depot/projects/uart/kern/kern_proc.c#4 integrate .. //depot/projects/uart/kern/kern_sig.c#9 integrate .. //depot/projects/uart/kern/kern_thread.c#7 integrate .. //depot/projects/uart/kern/link_elf.c#3 integrate .. //depot/projects/uart/kern/subr_param.c#4 integrate .. //depot/projects/uart/kern/subr_trap.c#3 integrate .. //depot/projects/uart/kern/subr_witness.c#4 integrate .. //depot/projects/uart/kern/sys_pipe.c#5 integrate .. //depot/projects/uart/kern/sys_process.c#3 integrate .. //depot/projects/uart/kern/sysv_msg.c#2 integrate .. //depot/projects/uart/kern/sysv_sem.c#2 integrate .. //depot/projects/uart/kern/sysv_shm.c#2 integrate .. //depot/projects/uart/kern/uipc_socket.c#4 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#3 integrate .. //depot/projects/uart/kern/vfs_subr.c#3 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#5 integrate .. //depot/projects/uart/libkern/random.c#2 integrate .. //depot/projects/uart/modules/Makefile#4 integrate .. //depot/projects/uart/modules/en/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/atm/atmpif/Makefile#1 branch .. //depot/projects/uart/net/bpf.c#2 integrate .. //depot/projects/uart/net/bpfdesc.h#2 integrate .. //depot/projects/uart/net/if_atm.h#5 integrate .. //depot/projects/uart/net/if_loop.c#2 integrate .. //depot/projects/uart/netgraph/atm/atmpif/ng_atmpif.c#1 branch .. //depot/projects/uart/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch .. //depot/projects/uart/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch .. //depot/projects/uart/netgraph/atm/ng_atmpif.h#1 branch .. //depot/projects/uart/netinet/if_atm.c#2 integrate .. //depot/projects/uart/netinet/in.h#2 integrate .. //depot/projects/uart/netinet/in_pcb.c#2 integrate .. //depot/projects/uart/netinet/in_proto.c#2 integrate .. //depot/projects/uart/netinet/ip_mroute.c#2 integrate .. //depot/projects/uart/netinet/ip_mroute.h#2 integrate .. //depot/projects/uart/netinet/ip_output.c#3 integrate .. //depot/projects/uart/netinet/ip_var.h#2 integrate .. //depot/projects/uart/netinet/pim.h#1 branch .. //depot/projects/uart/netinet/pim_var.h#1 branch .. //depot/projects/uart/netinet/raw_ip.c#3 integrate .. //depot/projects/uart/netinet6/nd6.c#2 integrate .. //depot/projects/uart/netinet6/nd6.h#2 integrate .. //depot/projects/uart/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/uart/netnatm/natm.c#3 integrate .. //depot/projects/uart/netnatm/natm.h#2 integrate .. //depot/projects/uart/netnatm/natm_pcb.c#2 integrate .. //depot/projects/uart/netnatm/natm_proto.c#2 integrate .. //depot/projects/uart/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/uart/pc98/pc98/clock.c#2 integrate .. //depot/projects/uart/pci/if_rl.c#8 integrate .. //depot/projects/uart/pci/if_rlreg.h#3 integrate .. //depot/projects/uart/pci/if_ti.c#2 integrate .. //depot/projects/uart/pci/meteor.c#2 integrate .. //depot/projects/uart/powerpc/include/critical.h#2 integrate .. //depot/projects/uart/powerpc/powerpc/critical.c#2 integrate .. //depot/projects/uart/sparc64/include/critical.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/critical.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/uart/sys/buf.h#2 integrate .. //depot/projects/uart/sys/kse.h#3 integrate .. //depot/projects/uart/sys/mman.h#2 integrate .. //depot/projects/uart/sys/namei.h#2 integrate .. //depot/projects/uart/sys/param.h#5 integrate .. //depot/projects/uart/sys/pipe.h#3 integrate .. //depot/projects/uart/sys/proc.h#4 integrate .. //depot/projects/uart/sys/socketvar.h#3 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/uart/vm/default_pager.c#2 integrate .. //depot/projects/uart/vm/device_pager.c#2 integrate .. //depot/projects/uart/vm/phys_pager.c#2 integrate .. //depot/projects/uart/vm/swap_pager.c#7 integrate .. //depot/projects/uart/vm/swap_pager.h#5 integrate .. //depot/projects/uart/vm/uma_core.c#8 integrate .. //depot/projects/uart/vm/uma_int.h#3 integrate .. //depot/projects/uart/vm/vm_contig.c#6 integrate .. //depot/projects/uart/vm/vm_glue.c#4 integrate .. //depot/projects/uart/vm/vm_init.c#3 integrate .. //depot/projects/uart/vm/vm_kern.c#4 integrate .. //depot/projects/uart/vm/vm_kern.h#2 integrate .. //depot/projects/uart/vm/vm_map.c#6 integrate .. //depot/projects/uart/vm/vm_map.h#3 integrate .. //depot/projects/uart/vm/vm_mmap.c#3 integrate .. //depot/projects/uart/vm/vm_object.c#4 integrate .. //depot/projects/uart/vm/vm_pager.c#3 integrate .. //depot/projects/uart/vm/vm_pager.h#3 integrate .. //depot/projects/uart/vm/vm_unix.c#2 integrate .. //depot/projects/uart/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/critical.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.4 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $"); #include #include @@ -31,17 +31,5 @@ struct thread *td; td = curthread; - td->td_critnest = 1; td->td_md.md_savecrit = ALPHA_PSL_IPL_0; } - -/* - * cpu_thread_link() - thread linkup, initialize machine-dependant fields - */ -void -cpu_thread_link(struct thread *td) -{ - - td->td_md.md_savecrit = 0; -} - ==== //depot/projects/uart/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $"); #include #include @@ -1552,10 +1552,11 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; - + vm_page_unlock_queues(); splx(s); } ==== //depot/projects/uart/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $"); #include "opt_kstack_pages.h" @@ -248,8 +248,6 @@ void cpu_thread_exit(struct thread *td) { - - return; } void @@ -318,8 +316,31 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { + struct pcb *pcb; + struct trapframe *tf; + uint64_t stack; - /* XXX */ + pcb = td->td_pcb; + tf = td->td_frame; + stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15; + + bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0])); + bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp)); + pcb->pcb_fp_control = 0; + pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED | + FPCR_OVFD | FPCR_INED | FPCR_UNFD; + if (td != curthread) { + pcb->pcb_hw.apcb_usp = stack; + pcb->pcb_hw.apcb_unique = 0; + } else { + alpha_pal_wrusp(stack); + alpha_pal_wrunique(0); + } + tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET; + tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func; + tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox; + tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC]; /* aka. PV */ + tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } /* ==== //depot/projects/uart/alpha/include/critical.h#2 (text+ko) ==== @@ -8,11 +8,10 @@ * 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: src/sys/alpha/include/critical.h,v 1.1 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.2 2003/08/04 20:32:44 jhb Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -24,7 +23,6 @@ * Prototypes - see //critical.c */ void cpu_critical_fork_exit(void); -void cpu_thread_link(struct thread *td); #ifdef __GNUC__ ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.51 2003/08/04 23:40:35 scottl Exp $"); #include #include @@ -476,7 +476,8 @@ else pmap = NULL; - if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)) { + if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) && + map->pagesneeded == 0) { vm_offset_t vendaddr; /* ==== //depot/projects/uart/amd64/amd64/critical.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.11 2003/08/04 20:32:44 jhb Exp $"); #include #include @@ -28,16 +28,5 @@ struct thread *td; td = curthread; - td->td_critnest = 1; td->td_md.md_savecrit = read_rflags() | PSL_I; } - -/* - * cpu_thread_link() - thread linkup, initialize machine-dependant fields - */ -void -cpu_thread_link(struct thread *td) -{ - - td->td_md.md_savecrit = 0; -} ==== //depot/projects/uart/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.430 2003/08/10 21:53:55 alc Exp $"); /* * Manages physical address maps. @@ -208,7 +208,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static void amd64_protection_init(void); -static void pmap_changebit(vm_page_t m, int bit, boolean_t setem) +static void pmap_clear_ptes(vm_page_t m, int bit) __always_inline; static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -1466,10 +1466,12 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; + vm_page_unlock_queues(); splx(s); } @@ -2609,17 +2611,17 @@ } /* - * this routine is used to modify bits in ptes + * Clear the given bit in each of the given page's ptes. */ static __inline void -pmap_changebit(vm_page_t m, int bit, boolean_t setem) +pmap_clear_ptes(vm_page_t m, int bit) { register pv_entry_t pv; - register pt_entry_t *pte; + pt_entry_t pbits, *pte; int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || - (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) + (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; s = splvm(); @@ -2632,7 +2634,7 @@ /* * don't write protect pager mappings */ - if (!setem && (bit == PG_RW)) { + if (bit == PG_RW) { if (!pmap_track_modified(pv->pv_va)) continue; } @@ -2645,26 +2647,20 @@ #endif pte = pmap_pte(pv->pv_pmap, pv->pv_va); - - if (setem) { - *pte |= bit; - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - } else { - pt_entry_t pbits = *pte; - if (pbits & bit) { - if (bit == PG_RW) { - if (pbits & PG_M) { - vm_page_dirty(m); - } - pte_store(pte, pbits & ~(PG_M|PG_RW)); - } else { - pte_store(pte, pbits & ~bit); + pbits = *pte; + if (pbits & bit) { + if (bit == PG_RW) { + if (pbits & PG_M) { + vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pte_store(pte, pbits & ~(PG_M|PG_RW)); + } else { + pte_store(pte, pbits & ~bit); } + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } } - if (!setem && bit == PG_RW) + if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); splx(s); } @@ -2679,7 +2675,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_changebit(m, PG_RW, FALSE); + pmap_clear_ptes(m, PG_RW); } else { pmap_remove_all(m); } @@ -2750,7 +2746,7 @@ void pmap_clear_modify(vm_page_t m) { - pmap_changebit(m, PG_M, FALSE); + pmap_clear_ptes(m, PG_M); } /* @@ -2761,7 +2757,7 @@ void pmap_clear_reference(vm_page_t m) { - pmap_changebit(m, PG_A, FALSE); + pmap_clear_ptes(m, PG_A); } /* ==== //depot/projects/uart/amd64/include/critical.h#2 (text+ko) ==== @@ -8,11 +8,10 @@ * 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: src/sys/amd64/include/critical.h,v 1.3 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.4 2003/08/04 20:32:45 jhb Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -24,7 +23,6 @@ * Prototypes - see //critical.c */ void cpu_critical_fork_exit(void); -void cpu_thread_link(struct thread *td); #ifdef __GNUC__ ==== //depot/projects/uart/boot/i386/libi386/biosacpi.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $ */ #include @@ -66,6 +66,7 @@ sprintf(buf, "%d", revision); setenv("hint.acpi.0.revision", buf, 1); sprintf(buf, "%6s", rsdp->OemId); + buf[6] = '\0'; setenv("hint.acpi.0.oem", buf, 1); sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress); setenv("hint.acpi.0.rsdt", buf, 1); ==== //depot/projects/uart/boot/i386/libi386/biospnp.c#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/boot/i386/libi386/biospnp.c,v 1.7 2002/09/23 18:54:26 alfred Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $ */ /* @@ -263,7 +263,7 @@ switch(*p) { case 'w': - i = va_arg(ap, uint); + i = va_arg(ap, u_int); *(u_int16_t *)argp = i; argp += sizeof(u_int16_t); break; ==== //depot/projects/uart/boot/powerpc/loader/start.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.2 2001/10/07 13:22:25 benno Exp $ */ +/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.3 2003/08/05 11:30:18 grehan Exp $ */ /* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */ /* @@ -38,63 +38,63 @@ void startup(void *, int, int (*)(void *), char *, int); #ifdef XCOFF_GLUE -asm(" - .text - .globl _entry -_entry: - .long _start,0,0 +asm(" \n\ + .text \n\ + .globl _entry \n\ +_entry: \n\ + .long _start,0,0 \n\ "); #endif -__asm(" - .data -stack: - .space 16388 - - .text - .globl _start -_start: - li 8,0 - li 9,0x100 - mtctr 9 -1: - dcbf 0,8 - icbi 0,8 - addi 8,8,0x20 - bdnz 1b - sync - isync - - lis 1,stack@ha - addi 1,1,stack@l - addi 1,1,8192 - - mfmsr 8 - li 0,0 - mtmsr 0 - isync - - mtibatu 0,0 - mtibatu 1,0 - mtibatu 2,0 - mtibatu 3,0 - mtdbatu 0,0 - mtdbatu 1,0 - mtdbatu 2,0 - mtdbatu 3,0 - - li 9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ - mtibatl 0,9 - mtdbatl 0,9 - li 9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ - mtibatu 0,9 - mtdbatu 0,9 - isync - - mtmsr 8 - isync - - b startup +__asm(" \n\ + .data \n\ +stack: \n\ + .space 16388 \n\ + \n\ + .text \n\ + .globl _start \n\ +_start: \n\ + li %r8,0 \n\ + li %r9,0x100 \n\ + mtctr %r9 \n\ +1: \n\ + dcbf %r0,%r8 \n\ + icbi %r0,%r8 \n\ + addi %r8,%r8,0x20 \n\ + bdnz 1b \n\ + sync \n\ + isync \n\ + \n\ + lis %r1,stack@ha \n\ + addi %r1,%r1,stack@l \n\ + addi %r1,%r1,8192 \n\ + \n\ + mfmsr %r8 \n\ + li %r0,0 \n\ + mtmsr %r0 \n\ + isync \n\ + \n\ + mtibatu 0,%r0 \n\ + mtibatu 1,%r0 \n\ + mtibatu 2,%r0 \n\ + mtibatu 3,%r0 \n\ + mtdbatu 0,%r0 \n\ + mtdbatu 1,%r0 \n\ + mtdbatu 2,%r0 \n\ + mtdbatu 3,%r0 \n\ + \n\ + li %r9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ \n\ + mtibatl 0,%r9 \n\ + mtdbatl 0,%r9 \n\ + li %r9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ \n\ + mtibatu 0,%r9 \n\ + mtdbatu 0,%r9 \n\ + isync \n\ + \n\ + mtmsr %r8 \n\ + isync \n\ + \n\ + b startup \n\ "); void ==== //depot/projects/uart/cam/scsi/scsi_da.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.149 2003/07/29 18:08:16 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.151 2003/08/06 17:30:03 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -146,22 +146,7 @@ static struct da_quirk_entry da_quirk_table[] = { -#ifdef DA_OLD_QUIRKS - /* - * Logitec USB/Firewire LHD-P30FU - */ { - /* USB part */ - {T_DIRECT, SIP_MEDIA_FIXED, "HITACHI_", "DK23DA*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* Firewire part */ - {T_DIRECT, SIP_MEDIA_FIXED, "LSILogic", "SYM13FW*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, -#endif /* DA_OLD_QUIRKS */ - { /* * Fujitsu M2513A MO drives. * Tested devices: M2513A2 firmware versions 1200 & 1300. @@ -296,24 +281,6 @@ }, { /* - * Maxtor 3000LE USB Drive - */ - {T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * LaCie USB drive, among others - */ - {T_DIRECT, SIP_MEDIA_FIXED, "Maxtor*", "D080H4*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - {T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Microtech USB CameraMate */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", @@ -338,13 +305,6 @@ }, { /* - * Olympus digital cameras (D-370) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D-*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Olympus digital cameras (E-100RS, E-10). */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, @@ -367,34 +327,6 @@ }, { /* - * Nikon Coolpix E775/E995 Cameras - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Nikon Coolpix E885 Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Nikon", "Digital Camera", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * SimpleTech FlashLink UCF-100 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OEI-USB", "CompactFlash", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Minolta Dimage 2330 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DIMAGE 2330*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Minolta Dimage E203 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, @@ -402,21 +334,6 @@ }, { /* - * DIVA USB Mp3 Player. - * PR: kern/33638 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "DIVA USB", "Media Reader","*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Daisy Technology PhotoClip USB Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Digital", "World DMC","*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Apacer HandyDrive * PR: kern/43627 */ @@ -433,22 +350,6 @@ }, { /* - * HP 315 Digital Camera - * PR: kern/41010 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "HP", "USB CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Fujitsu-Siemens Memorybird pen drive - * PR: kern/34712 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Fujitsu", "Memorybird", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Sony USB Key-Storage * PR: kern/46386 */ @@ -457,71 +358,12 @@ }, { /* - * Lexar Media Jumpdrive - * PR: kern/47006 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "LEXAR", "DIGITAL FILM", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Pentax USB Optio 230 camera - * PR: kern/46369 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, - "PENTAX", "DIGITAL_CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Casio QV-R3 USB camera (uses Pentax chip as above) - * PR: kern/46545 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, - "CASIO", "DIGITAL_CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * M-Systems DiskOnKey USB flash key - * PR: kern/47793 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "M-Sys", "DiskOnKey", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * SanDisk ImageMate (I, II, ...) compact flash - * PR: kern/47877 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SanDisk", "ImageMate*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Feiya "slider" dual-slot flash reader. The vendor field - * is blank so this may match other devices. - * PR: kern/50020 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "", "USB CARD READER", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * SmartDisk (Mitsumi) USB floppy drive * PR: kern/50226 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, - { - /* - * OTi USB Flash Key - * PR: kern/51825 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OTi", "Flash Disk", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - } #endif /* DA_OLD_QUIRKS */ }; @@ -1499,15 +1341,8 @@ } else { bp->bio_resid = csio->resid; bp->bio_error = 0; - if (bp->bio_resid != 0) { - /* Short transfer ??? */ -#if 0 - if (cmd6workaround(done_ccb) - == ERESTART) - return; -#endif + if (bp->bio_resid != 0) bp->bio_flags |= BIO_ERROR; - } } if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 12 08:37:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C73337B404; Tue, 12 Aug 2003 08:37:32 -0700 (PDT) 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 113FD37B401 for ; Tue, 12 Aug 2003 08:37:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9674C43F93 for ; Tue, 12 Aug 2003 08:37:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7CFbV0U055795 for ; Tue, 12 Aug 2003 08:37:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7CFbUko055792 for perforce@freebsd.org; Tue, 12 Aug 2003 08:37:30 -0700 (PDT) Date: Tue, 12 Aug 2003 08:37:30 -0700 (PDT) Message-Id: <200308121537.h7CFbUko055792@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 35988 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, 12 Aug 2003 15:37:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=35988 Change 35988 by jhb@jhb_laptop on 2003/08/12 08:36:52 Turn on ACPI. Affected files ... .. //depot/projects/smpng/sys/i386/conf/X86#8 edit .. //depot/projects/smpng/sys/i386/conf/X86-up#8 edit Differences ... ==== //depot/projects/smpng/sys/i386/conf/X86#8 (text+ko) ==== @@ -49,8 +49,7 @@ options KTR_ENTRIES=16384 # ACPI -#device acpica -#device pmtimer +device acpi device isa device pci ==== //depot/projects/smpng/sys/i386/conf/X86-up#8 (text+ko) ==== @@ -45,8 +45,7 @@ options KTR_ENTRIES=16384 # ACPI -#device acpica -#device pmtimer +device acpi device isa device pci From owner-p4-projects@FreeBSD.ORG Tue Aug 12 13:57:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD62C37B405; Tue, 12 Aug 2003 13:57:14 -0700 (PDT) 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 7C00237B401 for ; Tue, 12 Aug 2003 13:57:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D98D843FA3 for ; Tue, 12 Aug 2003 13:57:11 -0700 (PDT) (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.6/8.12.6) with ESMTP id h7CKvB0U084156 for ; Tue, 12 Aug 2003 13:57:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7CKv8Wh084153 for perforce@freebsd.org; Tue, 12 Aug 2003 13:57:08 -0700 (PDT) Date: Tue, 12 Aug 2003 13:57:08 -0700 (PDT) Message-Id: <200308122057.h7CKv8Wh084153@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 36005 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, 12 Aug 2003 20:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=36005 Change 36005 by rwatson@rwatson_tislabs on 2003/08/12 13:56:13 Integrate the MAC branch from the TrustedBSD base branch: mostly to bring in ACL-related structural changes in the UFS and VFS code. Also a variety of bugfixes, enhancements, et al (especially relating to threading on various platforms). Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#20 integrate .. //depot/projects/trustedbsd/mac/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#17 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#8 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#15 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#25 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/netoptions#2 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#13 integrate .. //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.c#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regex.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/ru.KOI8-R#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/glob.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/Ovfork.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/fork.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/setlogin.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/swapcontext.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/collcmp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/connect.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kqueue.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/makelist#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/include/ksd.h#3 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/ksd.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/thr_getcontext.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/ksd.h#4 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/ksd.h#2 delete .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_concurrency.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#9 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#48 integrate .. //depot/projects/trustedbsd/mac/release/Makefile.inc.docports#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/errata/article.sgml#11 integrate .. //depot/projects/trustedbsd/mac/release/ia64/doFS.sh#6 delete .. //depot/projects/trustedbsd/mac/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/trustedbsd/mac/release/pc98/dokern.sh#13 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/atm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/fore_dnld/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/ilmid/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/camcontrol.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/modeedit.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/util.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#16 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/interactive.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/main.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/route/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/colldef/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/cdev/module/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/cdev/module/cdevmod.c#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/cdev/test/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/cdev/test/testcdev.c#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/firewire.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/release.7#14 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/am_ET.UTF-8.src#1 branch .. //depot/projects/trustedbsd/mac/share/monetdef/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/monetdef/am_ET.UTF-8.src#1 branch .. //depot/projects/trustedbsd/mac/share/msgdef/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/am_ET.UTF-8.src#1 branch .. //depot/projects/trustedbsd/mac/share/numericdef/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/numericdef/am_ET.UTF-8.src#1 branch .. //depot/projects/trustedbsd/mac/share/termcap/termcap.src#13 integrate .. //depot/projects/trustedbsd/mac/share/timedef/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/timedef/am_ET.UTF-8.src#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/critical.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/critical.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/endian.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/critical.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/critical.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/endian.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/efiboot.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/efifs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/loader/main.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#45 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#54 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/oltr/if_oltr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/digi.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midwayvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewirereg.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwe.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatmvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/if_patm_tx.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/if_patmvar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/pucdata.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sym/sym_fw.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_freebsd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twereg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/critical.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/exception.s#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/sys_machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/clock.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/critical.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/endian.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/sysarch.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/cxreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spic.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/wt.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/clock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/critical.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/genassym.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/interrupt.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/timerreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/ia64/include/clock.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/cpu.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/critical.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/endian.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/ucontext.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#109 integrate .. //depot/projects/trustedbsd/mac/sys/modules/en/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ep/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atm.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_atm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_pcb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_proto.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/ppc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/sio.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/critical.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/endian.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/critical.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/critical.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/critical.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/acl.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sys/buf.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kse.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#26 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#45 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#32 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/acl.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_acl.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#68 integrate .. //depot/projects/trustedbsd/mac/sys/vm/default_pager.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/device_pager.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/phys_pager.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#23 integrate .. //depot/projects/trustedbsd/mac/tools/tools/README#11 integrate .. //depot/projects/trustedbsd/mac/tools/tools/hcomp/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/hcomp/hcomp.pl#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/etc/experimental.rc#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/powerpc.diff#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.1#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.pl#10 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.birthday#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/jot/jot.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mroute.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/quota/quota.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/cmdtab.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/extern.h#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/icmp6.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/systat/ip6.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/systat/netstat.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/systat.1#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tr/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tr/str.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tr/tr.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tr/tr.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/ia64-fbsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidump/acpi.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/acpidump/acpidump.h#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/include/newvers.sh#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mergemaster/mergemaster.sh#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/named/Makefile.maninc#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ndp/ndp.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.c#15 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pccard/pccardd/cardd.h#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/match.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#20 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.76 2003/07/30 10:43:13 bp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.77 2003/08/01 17:54:11 mbr Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so +dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. RELENG_4_* security-officer Requires Security Officer approval. libfetch des Advance notification requested. ==== //depot/projects/trustedbsd/mac/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.287 2003/08/06 11:06:38 ru Exp $ # # The user-driven targets are: # @@ -105,7 +105,7 @@ # world: upgrade_checks @echo "--------------------------------------------------------------" - @echo ">>> elf make world started on ${STARTTIME}" + @echo ">>> make world started on ${STARTTIME}" @echo "--------------------------------------------------------------" .if target(pre-world) @echo @@ -125,7 +125,8 @@ .endif @echo @echo "--------------------------------------------------------------" - @printf ">>> elf make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @echo ">>> make world completed on `LC_ALL=C date`" + @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" # @@ -198,7 +199,8 @@ .endfor .endfor @echo "--------------------------------------------------------------" - @printf ">>> make universe completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @echo ">>> make universe completed on `LC_ALL=C date`" + @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#17 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.63 2003/06/12 16:53:55 scottl Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.64 2003/08/05 10:31:28 brueffer Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -262,9 +262,9 @@ displayed using the ``%a6.15p'' format. Otherwise, the start time is displayed using the ``%e%b%y'' format. .It state -The state is given by a sequence of letters, for example, +The state is given by a sequence of characters, for example, .Dq Tn RWNA . -The first letter indicates the run state of the process: +The first character indicates the run state of the process: .Pp .Bl -tag -width indent -compact .It D ==== //depot/projects/trustedbsd/mac/bin/sh/expand.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.44 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.45 2003/08/03 04:28:10 ache Exp $"); #include #include @@ -116,20 +116,13 @@ STATIC int collate_range_cmp(int, int); STATIC int -collate_range_cmp (int c1, int c2) +collate_range_cmp(int c1, int c2) { static char s1[2], s2[2]; - int ret; - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); s1[0] = c1; s2[0] = c2; - if ((ret = strcoll(s1, s2)) != 0) - return (ret); - return (c1 - c2); + return (strcoll(s1, s2)); } /* ==== //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright[] = "$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.27 2003/07/28 13:25:04 mbr Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.28 2003/08/06 15:19:52 mbr Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -217,7 +217,7 @@ } else if (!strcmp (argv [i], "-i")) { if (++i == argc) usage (); - polling_interval = (int)strtol(argv [i], + polling_interval = (int)strtol (argv [i], (char **)NULL, 10); if (polling_interval <= 0) { log_info ("Incorrect polling interval %d", @@ -257,8 +257,8 @@ log_fatal ("%s: interface name too long (max %ld)", argv [i], (long)strlen (argv [i])); strlcpy (tmp -> name, argv [i], IFNAMSIZ); - set_ieee802(tmp); - tmp->linkstatus = interface_active(tmp); + set_ieee80211 (tmp); + tmp -> linkstatus = interface_active (tmp); if (interfaces) { interface_reference (&tmp -> next, interfaces, MDL); @@ -286,16 +286,16 @@ /* first kill of any currently running client */ if (release_mode) { - if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { - e = fscanf(pidfd, "%d", &oldpid); + if ((pidfd = fopen (path_dhclient_pid, "r")) != NULL) { + e = fscanf (pidfd, "%d", &oldpid); if (e != 0 && e != EOF) { if (oldpid) { - if (kill(oldpid, SIGKILL) == 0) - unlink(path_dhclient_pid); + if (kill (oldpid, SIGKILL) == 0) + unlink (path_dhclient_pid); } } - fclose(pidfd); + fclose (pidfd); } } @@ -412,7 +412,7 @@ INTERFACE_AUTOMATIC)) != INTERFACE_REQUESTED)) continue; - set_ieee802(ip); + set_ieee80211 (ip); script_init (ip -> client, "PREINIT", (struct string_list *)0); if (ip -> client -> alias) @@ -459,7 +459,7 @@ add_timeout (cur_time + random () % 5, state_link, client, 0, 0); #else - add_timeout(cur_time + random () % 5, + add_timeout (cur_time + random () % 5, state_reboot, client, 0, 0); #endif } @@ -1385,7 +1385,7 @@ int interval; int increase = 1; - if (interface_active(client -> interface) == 0) + if (interface_active (client -> interface) == 0) return; /* Figure out how long it's been since we started transmitting. */ @@ -1493,7 +1493,7 @@ struct client_lease *loop; struct client_lease *lp; - if (interface_active(client -> interface) == 0) + if (interface_active (client -> interface) == 0) return; loop = lp = client -> active; @@ -2809,8 +2809,8 @@ break; } client -> state = S_INIT; - if (interface_active(ip)) - state_reboot(client); + if (interface_active (ip)) + state_reboot (client); } } } @@ -2971,8 +2971,8 @@ client -> state = S_INIT; /* Set up a timeout to start the initialization process. */ - if (interface_active(ip)) { - add_timeout(cur_time + random () % 5, + if (interface_active (ip)) { + add_timeout (cur_time + random () % 5, state_reboot, client, 0, 0); } } @@ -3038,8 +3038,8 @@ break; case server_awaken: - if (interface_active(ip)) - state_reboot(client); + if (interface_active (ip)) + state_reboot (client); break; } } @@ -3188,32 +3188,32 @@ ifname = ip -> name; - if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - log_fatal("Can't create interface_active socket"); + if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) + log_fatal ("Can't create interface_active socket"); - (void) memset(&ifmr, 0, sizeof(ifmr)); - (void) strncpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); + (void) memset (&ifmr, 0, sizeof (ifmr)); + (void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name)); - if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { /* * Interface doesn't support SIOCGIFMEDIA, presume okay */ - close(sock); + close (sock); return (1); } - close(sock); + close (sock); if (ifmr.ifm_count == 0) { /* * this is unexpected (to me), but we'll just assume * that this means interface does not support SIOCGIFMEDIA */ - log_fatal("%s: no media types?", ifname); + log_fatal ("%s: no media types?", ifname); return (1); } if (ifmr.ifm_status & IFM_AVALID) { - if (ip->ieee802) { + if (ip -> ieee80211) { if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) && (ifmr.ifm_status & IFM_ACTIVE)) return (1); @@ -3231,7 +3231,7 @@ } #ifdef __FreeBSD__ -set_ieee802 (struct interface_info *ip) { +set_ieee80211 (struct interface_info *ip) { struct ieee80211req ireq; u_int8_t data[32]; @@ -3242,11 +3242,11 @@ ifname = ip -> name; - if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - log_fatal("Can't create interface_active socket"); + if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) + log_fatal ("Can't create interface_active socket"); - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, ifname, sizeof(ireq.i_name)); + (void) memset (&ireq, 0, sizeof (ireq)); + (void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name)); ireq.i_data = &data; ireq.i_type = IEEE80211_IOC_SSID; ireq.i_val = -1; @@ -3254,15 +3254,15 @@ * If we can't get the SSID, * this isn't an 802.11 device. */ - if (ioctl(sock, SIOCG80211, &ireq) < 0) - ip->ieee802 = 0; + if (ioctl (sock, SIOCG80211, &ireq) < 0) + ip -> ieee80211 = 0; else { #ifdef DEBUG - printf("Device %s has 802.11\n", ifname); + printf ("Device %s has 802.11\n", ifname); #endif - ip->ieee802 = 1; + ip -> ieee80211 = 1; } - close(sock); + close (sock); } #endif /* __FreeBSD__ */ @@ -3275,29 +3275,29 @@ struct client_state *client; #ifdef DEBUG - printf("Polling interface status\n"); + printf ("Polling interface status\n"); #endif for (ip = interfaces; ip; ip = ip -> next) { - if (ip->linkstatus == 0 || doinitcheck == 0) { - if (interface_active(ip)) { + if (ip -> linkstatus == 0 || doinitcheck == 0) { + if (interface_active (ip)) { #ifdef DEBUG - printf("%s: Found Link on interface\n", ip->name); + printf ("%s: Found Link on interface\n", ip -> name); #endif for (client = ip -> client; client; client = client -> next) { - add_timeout(cur_time + random () % 5, + add_timeout (cur_time + random () % 5, state_reboot, client, 0, 0); } - ip->linkstatus = 1; + ip -> linkstatus = 1; } else { #ifdef DEBUG - printf("%s: No Link on interface\n", ip->name); + printf ("%s: No Link on interface\n", ip -> name); #endif for (client = ip -> client; client; client = client -> next) { - cancel_timeout(state_init, client); - cancel_timeout(send_discover, client); - cancel_timeout(send_request, client); + cancel_timeout (state_init, client); + cancel_timeout (send_discover, client); + cancel_timeout (send_request, client); /* * XXX without this, dhclient does * not poll on a interface if there @@ -3305,18 +3305,18 @@ * time */ if (client -> state == S_INIT) { - add_timeout(cur_time + polling_interval, + add_timeout (cur_time + polling_interval, state_link, client, 0, 0); } } - ip->linkstatus = 0; + ip -> linkstatus = 0; } } else { - if (interface_active(ip) == 0) { + if (interface_active (ip) == 0) { #ifdef DEBUG - printf("%s: Lost Link on interface\n", ip->name); + printf ("%s: Lost Link on interface\n", ip -> name); #endif - ip->linkstatus = 0; + ip -> linkstatus = 0; } } } ==== //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#8 (text+ko) ==== @@ -40,7 +40,7 @@ * see ``http://www.vix.com''. To learn more about Nominum, Inc., see * ``http://www.nominum.com''. * - * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.3 2003/07/28 11:49:07 mbr Exp $ + * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.4 2003/08/06 15:19:52 mbr Exp $ */ #ifndef __CYGWIN32__ @@ -781,7 +781,7 @@ char name [IFNAMSIZ]; /* Its name... */ int linkstatus; /* Link status */ - int ieee802; /* True if media is ieee802 */ + int ieee80211; /* True if media is ieee80211 */ int index; /* Its index. */ int rfdesc; /* Its read file descriptor. */ int wfdesc; /* Its write file descriptor, if ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.99 2003/07/29 08:02:26 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.100 2003/08/05 05:42:07 mtm Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -277,6 +277,8 @@ .. af_ZA.ISO8859-15 .. + am_ET.UTF-8 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.277 2003/07/29 08:02:26 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.278 2003/08/05 05:42:07 mtm Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -337,6 +337,8 @@ .. af_ZA.ISO8859-15 .. + am_ET.UTF-8 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 @@ -667,6 +669,8 @@ .. af_ZA.ISO8859-15 .. + am_ET.UTF-8 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 ==== //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.23 2003/07/30 20:05:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.24 2003/08/06 00:35:13 mtm Exp $ .include @@ -19,7 +19,7 @@ ipnat ipsec ipxrouted isdnd \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ - ldconfig local localdaemons lomac lpd \ + ldconfig local localdaemons localpkg lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ named netif netoptions \ ==== //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.3 2003/08/06 00:35:13 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi # BEFORE: securelevel -# KEYWORD: FreeBSD shutdown +# KEYWORD: FreeBSD nostart . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/netoptions#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.138 2003/06/29 05:09:48 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.139 2003/08/06 00:35:13 mtm Exp $ # # PROVIDE: netoptions -# REQUIRE: localdaemons +# REQUIRE: localpkg # BEFORE: securelevel # KEYWORD: FreeBSD ==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 -# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.30 2003/06/19 07:02:00 murray Exp $ +# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.32 2003/08/04 21:31:53 ache Exp $ FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \ @@ -37,6 +37,6 @@ strfile -Csx ${.ALLSRC} ${.TARGET} fortunes-o: fortunes-o.${TYPE} - tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET} + LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.30 2003/02/15 09:11:25 robert Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.31 2003/08/02 20:36:28 schweikh Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -439,7 +439,7 @@ "sockstat -4l" for IPv4, and "sockstat -l" for IPv4 and IPv6. -- Dru % -Can't remember is you've installed a certain port or not? Try "pkg_info | +Can't remember if you've installed a certain port or not? Try "pkg_info | grep port_name". -- Dru % @@ -449,7 +449,7 @@ To repeat the last command in the C shell, type "!!". -- Dru % -Need to quickly empty a file? Use "echo > filename". +Need to quickly empty a file? Use ": > filename". -- Dru % To see all of the directories on your FreeBSD system, type @@ -466,10 +466,6 @@ ifconfig -a -- Dru % -You can save your kernel startup configuration with kget(8). The -Configuration can be edited at boot time with 'boot -c' command in loader. -See boot(8), loader(8) for details. -% You can open up a new split-screen window in (n)vi with :N or :E and then use ^w to switch between the two. % ==== //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.23 2003/08/03 19:44:36 ache Exp $"); # include # include @@ -131,7 +131,7 @@ void add_offset(FILE *, long); int cmp_str(const void *, const void *); -static int collate_range_cmp(int, int); +static int stable_collate_range_cmp(int, int); void do_order(void); void getargs(int, char **); void randomize(void); @@ -367,16 +367,12 @@ Tbl.str_flags |= STR_ORDERED; } -static int collate_range_cmp (c1, c2) +static int stable_collate_range_cmp(c1, c2) int c1, c2; { static char s1[2], s2[2]; int ret; - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); s1[0] = c1; s2[0] = c2; if ((ret = strcoll(s1, s2)) != 0) @@ -404,8 +400,8 @@ c1 = (unsigned char) p1->first; c2 = (unsigned char) p2->first; - if ((r = collate_range_cmp(c1, c2)) != 0) - return r; + if ((r = stable_collate_range_cmp(c1, c2)) != 0) + return (r); (void) fseek(Sort_1, p1->pos, 0); (void) fseek(Sort_2, p2->pos, 0); @@ -424,8 +420,8 @@ if (isupper(c2)) c2 = tolower(c2); } - if ((r = collate_range_cmp(c1, c2)) != 0) - return r; + if ((r = stable_collate_range_cmp(c1, c2)) != 0) + return (r); SET_N(n1, c1); SET_N(n2, c2); c1 = getc(Sort_1); @@ -435,7 +431,7 @@ c1 = 0; if (IS_END(c2, n2)) c2 = 0; - return collate_range_cmp(c1, c2); + return (stable_collate_range_cmp(c1, c2)); } /* ==== //depot/projects/trustedbsd/mac/gnu/lib/libregex/regex.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.10 2003/08/03 04:36:09 ache Exp $ */ + /* AIX requires this to be the first thing in the file. */ #if defined (_AIX) && !defined (REGEX_MALLOC) #pragma alloca @@ -1114,19 +1116,14 @@ regnum_t regnum)); #ifdef __FreeBSD__ -static int collate_range_cmp (a, b) +static int collate_range_cmp(a, b) int a, b; { - int r; static char s[2][2]; - if ((unsigned char)a == (unsigned char)b) - return 0; s[0][0] = a; s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (unsigned char)a - (unsigned char)b; - return r; + return (strcoll(s[0], s[1])); } #endif ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.9 2003/08/04 21:31:52 ache Exp $ BINDIR?= /usr/bin SHELL= /bin/sh @@ -125,7 +125,7 @@ -e "s;@VERSION@;$(version)$(revision);g" \ -e "s;@MDATE@;`$(SHELL) ${GROFF_DIST}/mdate.sh $<`;g" \ -e "s;@g@;$(g);g" \ - -e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \ + -e "s;@G@;`echo $(g) | LC_ALL=C tr a-z A-Z`;g" \ $< >$@ .SUFFIXES: .sh .pl >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 12 19:40:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8306D37B404; Tue, 12 Aug 2003 19:40:06 -0700 (PDT) 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 1888037B401 for ; Tue, 12 Aug 2003 19:40:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 991A043FA3 for ; Tue, 12 Aug 2003 19:40:03 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7D2e30U012116 for ; Tue, 12 Aug 2003 19:40:03 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7D2cKoD011239 for perforce@freebsd.org; Tue, 12 Aug 2003 19:38:20 -0700 (PDT) Date: Tue, 12 Aug 2003 19:38:20 -0700 (PDT) Message-Id: <200308130238.h7D2cKoD011239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Hrishikesh_Dandekar@NAI.com using -f From: Hrishikesh Dandekar To: Perforce Change Reviews Subject: PERFORCE change 36026 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: Wed, 13 Aug 2003 02:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=36026 Change 36026 by hdandeka@hdandeka_yash on 2003/08/12 19:37:38 Reverse integrate the changes from the rishi_sebsd branch into the trustedbsd sebsd parent branch. The rishi_sebsd branch contains a merge between the trustedbsd mac branch head and the trustedbsd sebsd branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#2 integrate .. //depot/projects/trustedbsd/sebsd/MERGE#1 branch .. //depot/projects/trustedbsd/sebsd/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#2 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.upgrade#2 delete .. //depot/projects/trustedbsd/sebsd/README#2 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/cat/cat.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/sebsd/bin/chio/chio.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/chio/chio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/chmod/chmod.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/date.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/netdate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/args.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/conv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/extern.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/misc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/position.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/df.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/df/df.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/domainname/domainname.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/echo/echo.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/echo/echo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/cbc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/ed.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/ed.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/io.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/re.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/expr/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/hostname/hostname.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/kill/kill.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/mv/pathnames.h#2 delete .. //depot/projects/trustedbsd/sebsd/bin/pax/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/ar_io.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/ar_subs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/buf_subs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/cache.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/cpio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/extern.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/ftree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/gen_subs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/getoldopt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/options.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/pat_rep.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/pax.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/pax.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/pax.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/sel_subs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/tables.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/tar.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/tar.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/extern.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/fmt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/keyword.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/nlist.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pwd/pwd.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/pwd/pwd.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rcp/rcp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/realpath/realpath.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/echo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/cd.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/input.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/machdep.h#2 delete .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mknodes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/redir.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/stty/gfmt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/stty/stty.c#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sync/sync.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/CHANGES#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/FREEBSD-Upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/Version#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dig/dig.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/dnsquery/dnsquery.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/host/host.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named-xfer/named-xfer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_ixfr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_load.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/db_sec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ctl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_forw.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_func.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_glob.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_init.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ixfr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_lexer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_maint.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_ncache.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_parser.y#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_req.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_resp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_update.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/ndc/ndc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/getinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/logging.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/html/options.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/dig.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named-xfer.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/named.conf.5#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/doc/man/resolver.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/hesiod.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/irp.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/irs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/dst.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/logging.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/misc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/isc/tree.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/netgroup.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/bsafe_link.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/cylink_link.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/dst_api.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_gr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/dns_nw.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gen_gr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/gethostent.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetgrent.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/getnetgrent_r.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irp_p.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/irs_data.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_gr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/irs/nis_ho.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_clnt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ctl_srvr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_timers.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/ev_waits.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/eventlib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/eventlib_p.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/isc/logging.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_name.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/nameser/ns_sign.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_findzonecut.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_mkquery.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_query.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/lib/resolv/res_update.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/bin/probe_ipv6#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind/port/freebsd/include/port_after.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/binutils/bfd/elf64-alpha.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/binutils/include/opcode/arc.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/include/opcode/convex.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/include/opcode/np1.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/include/opcode/pn.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/arcelf.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32b4300.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32bmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32elmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32l4300.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32lmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/elf64bmip.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/sh.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/shl.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/shlelf.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/ld/emulparams/vsta.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/com_err/getarg.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/FAQ#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/INSTALL#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/NEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/config.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/configure#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/configure.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/HACKING.DOCS#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/client.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/log.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/options.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/root.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/scramble.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/server.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/status.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/update.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/prepend_args.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/.cvsignore#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/archive#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/audio#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/compress#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/elf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/flash#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/gringotts#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/hdf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/hp#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/images#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/python#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/sql#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Makefile.am#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/Makefile.std#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/acconfig.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/apprentice.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/ascmagic.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/config.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/configure#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/configure.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/file.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/file.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/file.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/magic.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/magic.mime#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/readelf.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/file/softmagic.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.0#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.2#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.4#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.5#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.6#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog.7#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/FAQ#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/FSFChangeLog.10#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/FSFChangeLog.11#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/GNATS#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ONEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/README.Portability#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/alias.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/bugs.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-config-lang.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-dump.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-pretty-print.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-pretty-print.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfg.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config-ml.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.if#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.sub#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha-interix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/ev4.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/ev5.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/ev6.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/gnu.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/linux-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/openbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/osf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/osf5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-crtfm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-cc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-crt0-64.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-crt0.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-ld.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms-psxcrt0.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vms.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/vxworks.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/conix-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/netbsd-elf.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/unknown-elf-oabi.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/vxarm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-crt2.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/cmovd.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/cmovh.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/cmovw.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv-abi.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv-asm.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv-protos.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frv.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frvbegin.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/frvend.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/lib1funcs.asm#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/modi.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/t-frv#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/uitod.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/uitof.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/ulltod.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/ulltof.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/frv/umodi.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/athlon.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gstabs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/k6.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/linux-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/lynx-ng.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/mach.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/moss.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/pentium.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/ppro.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/svr3dbx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/svr3gas.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sysv3.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sysv4-cpp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-cygwin#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-interix#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-sco5gas#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/vsta.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/vxi386.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/win32.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xm-vsta.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/aix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/hpux_longdouble.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64-c.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-aix#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/linux-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/lynx-ng.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/openbsd-oldgas.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/psos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix31.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabiaix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabispe.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/mach.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/ppc64-fp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-netbsd#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-ppcendian#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rs6000-c-rule#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/vxppc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/windiss.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/t-crtstuff#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sol2.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/cypress.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/hypersparc.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/lb1spc.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/lb1spl.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/linux-aout.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/litecoff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/liteelf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/lynx.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/netbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/openbsd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/pbd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sol26-sld.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sp86x-elf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc-modes.def#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparclet.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sunos4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/supersparc.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/ultra1_2.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/ultra3.md#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/vxsim.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/vxsparc64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-darwin#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libc-ok#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-linux-gnulibc1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-netbsd#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/conflict.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/convert.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog.2#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cfns.gperf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/lang-options.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/lex.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parse.y#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/spew.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cplus-dem.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpperror.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppexp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpphash.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmain.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpptrad.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/debug.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/debug.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/demangle.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/df.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/df.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/bugreport.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/collect2.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/gty.texi#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/headerdirs.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/service.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dominance.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doschk.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dummy-conditions.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2asm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2asm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarfout.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/errors.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/et-forest.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/et-forest.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/except.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/except.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog.0#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/Make-lang.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bad.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bugs.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/com.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/com.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/config-lang.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/data.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/expr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ffe.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/g77.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/intdoc.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/intdoc.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/invoke.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/lang-specs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/lex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/parse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/root.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/stc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/std.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ste.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/target.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/target.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/top.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/version.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/where.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/where.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/faq.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fibheap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fibheap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/final.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fix-header.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fixproto#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flags.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gbl-ctors.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gccbug.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gccspec.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gdbinit.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/genattr.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 12 20:25:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6914D37B404; Tue, 12 Aug 2003 20:25:03 -0700 (PDT) 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 058BA37B401 for ; Tue, 12 Aug 2003 20:25:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD3DD43FBF for ; Tue, 12 Aug 2003 20:25:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7D3P10U053236 for ; Tue, 12 Aug 2003 20:25:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7D3P0OH053187 for perforce@freebsd.org; Tue, 12 Aug 2003 20:25:00 -0700 (PDT) Date: Tue, 12 Aug 2003 20:25:00 -0700 (PDT) Message-Id: <200308130325.h7D3P0OH053187@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 36030 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: Wed, 13 Aug 2003 03:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=36030 Change 36030 by marcel@marcel_nfs on 2003/08/12 20:24:03 IFC @36029 Affected files ... .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#26 integrate .. //depot/projects/ia64/etc/pccard_ether#10 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#30 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#10 integrate .. //depot/projects/ia64/sbin/atm/Makefile#3 integrate .. //depot/projects/ia64/sbin/atm/atmconfig/Makefile#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/atmconfig.8#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/atmconfig.h#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/atmconfig.help#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/diag.c#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/diag.h#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/main.c#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/natm.c#1 branch .. //depot/projects/ia64/sbin/atm/atmconfig/private.h#1 branch .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#6 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#4 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.8#6 integrate .. //depot/projects/ia64/share/man/man4/natmip.4#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/critical.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#14 integrate .. //depot/projects/ia64/sys/alpha/alpha/swtch.s#4 integrate .. //depot/projects/ia64/sys/alpha/include/critical.h#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/critical.c#4 integrate .. //depot/projects/ia64/sys/amd64/include/critical.h#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#63 integrate .. //depot/projects/ia64/sys/conf/files#93 integrate .. //depot/projects/ia64/sys/conf/options#63 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_access.c#3 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_audio.c#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#10 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/ia64/sys/dev/bktr/msp34xx.c#1 branch .. //depot/projects/ia64/sys/dev/ciss/ciss.c#23 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#32 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#13 integrate .. //depot/projects/ia64/sys/dev/twe/twe.c#7 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#7 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#18 integrate .. //depot/projects/ia64/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#13 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#20 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#21 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfsmount.h#5 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#6 integrate .. //depot/projects/ia64/sys/i386/i386/critical.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#27 integrate .. //depot/projects/ia64/sys/i386/include/critical.h#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/critical.c#3 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#89 integrate .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#62 integrate .. //depot/projects/ia64/sys/ia64/include/critical.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#64 integrate .. //depot/projects/ia64/sys/kern/subr_blist.c#8 integrate .. //depot/projects/ia64/sys/modules/bktr/bktr/Makefile#4 integrate .. //depot/projects/ia64/sys/netinet/if_atm.c#5 integrate .. //depot/projects/ia64/sys/powerpc/include/critical.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/critical.c#3 integrate .. //depot/projects/ia64/sys/sparc64/include/critical.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/critical.c#4 integrate .. //depot/projects/ia64/sys/sys/blist.h#6 integrate .. //depot/projects/ia64/sys/sys/proc.h#73 integrate .. //depot/projects/ia64/sys/vm/vm_map.h#25 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#24 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#11 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/ia64/usr.sbin/Makefile#47 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#10 integrate Differences ... ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.279 2003/08/08 13:43:48 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.280 2003/08/12 14:26:57 harti Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -67,6 +67,8 @@ doc IPv6 .. + atm + .. bind html .. ==== //depot/projects/ia64/etc/pccard_ether#10 (text+ko) ==== @@ -1,51 +1,83 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.33 2003/08/11 20:32:00 mbr Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.37 2003/08/12 22:44:48 mbr Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # # example: pccard_ether fxp0 start link0 # +. /etc/network.subr + stop_dhcp() { - if [ -s /var/run/dhclient.${interface}.pid ]; then - pidfile="/var/run/dhclient.${interface}.pid" - elif [ -s /var/run/dhcpc.${interface}.pid ]; then - pidfile="/var/run/dhcpc.${interface}.pid" - elif [ -s /var/run/dhclient.pid ]; then - # If dhclient is already running, record - # it's interfaces. - if [ -x /usr/bin/grep ]; then - eval _active_list=\"`/bin/ps -axwww | \ - /usr/bin/grep dhclient | \ - /usr/bin/grep -v grep | \ - /usr/bin/sed -e 's|^.*dhclient||' | \ - /usr/bin/awk '{for (i=1;i<=NF;i++) \ - { if ($i~/[a-zA-Z].[0-9]$/) \ - { printf(" %s",$i) } }}'` \ - \" - fi + # If dhclient is already running, record + # its interfaces. + if [ -x /usr/bin/grep ]; then + eval _active_list=\"`/bin/ps -axwww | \ + /usr/bin/grep dhclient | \ + /usr/bin/grep -v grep | \ + /usr/bin/sed -e 's|^.*dhclient||' | \ + /usr/bin/awk '{for (i=1;i<=NF;i++) \ + { if ($i~/[a-zA-Z].[0-9]$/) \ + { printf(" %s",$i) } }}'` \ + \" + fi + + # Get the rc.conf list of dhcp configured interfaces + static_dhcp_list="`list_net_interfaces dhcp`" - _aprefix= - for _if in _active_list ; do - _test_if=`ifconfig ${_if} 2>&1` - case "$_test_if" in - "ifconfig: interface $_if does not exist") - ;; - *) - _dhcplist="${_dhcplist}${_aprefix}${_if}" - [ -z "$_aprefix" ] && _aprefix=' ' - ;; - esac - done + # Get the current ifconfig list of interfaces + _aprefix= + _nlist= + for _if in ${_active_list} ; do + _test_if=`ifconfig ${_if} 2>&1` + case "$_test_if" in + "ifconfig: interface $_if does not exist") + ;; + ${interface}) + # Don't record the same device twice. + ;; + *) + # + # Catch devices which were specified before, + # but have not been part of the rc. We need + # them again for the restart. + # + for _cif in ${static_dhcp_list} ; do + case "$_cif" in + ${_if}) + # Nothing to add + ;; + *) + # Found interface beside rc.conf + _nlist="${_nlist}${_aprefix}${_if}" + ;; + esac + done + _dhcplist="${_dhcplist}${_aprefix}${_if}" + [ -z "$_aprefix" ] && _aprefix=' ' + ;; + esac + done + if [ -s /var/run/dhclient.pid ]; then pidfile="/var/run/dhclient.pid" else return fi kill `cat ${pidfile}` rm -f ${pidfile} - sh `/etc/rc.d/dhclient start` + case ${startstop} in + [Ss][Tt][Oo][Pp]) + if [ -z "${_nlist}" ]; then + sh `/etc/rc.d/dhclient start` + else + start_dhcp_keep_current + fi + ;; + *) + ;; + esac } start_dhcp() { @@ -60,11 +92,20 @@ [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" if [ -x "${dhclient_program}" ]; then - if [ `basename ${dhclient_program}` = "dhclient" ]; then - pidfile="/var/run/dhclient.${interface}.pid" - dhclient_flags="${dhclient_flags} -pf ${pidfile}" - fi - ${dhclient_program} ${dhclient_flags} $_dhcplist ${interface} + ${dhclient_program} ${dhclient_flags} $_dhcplist ${interface} + else + echo "${dhclient_program}: DHCP client software not available" + fi +} + +# Called after detaching a card, if dhclient has been +# used for more than one interface. +start_dhcp_keep_current() { + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" + [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" + if [ -x "${dhclient_program}" ]; then + ${dhclient_program} ${dhclient_flags} \ + ${_dhcplist} else echo "${dhclient_program}: DHCP client software not available" fi @@ -96,9 +137,11 @@ case ${startstop} in [Ss][Tt][Aa][Rr][Tt] | '') - if ifconfig ${interface} | grep -s UP, > /dev/null 2>&1; then - # Interface is already up, so ignore it. - exit 0 + if [ -x /usr/bin/grep ]; then + if ifconfig ${interface} | grep -s UP, > /dev/null 2>&1; then + # Interface is already up, so ignore it. + exit 0 + fi fi if [ -r /etc/start_if.${interface} ]; then ==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.1 2003/08/05 22:45:59 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.2 2003/08/12 22:13:06 davidxu Exp $ */ #include @@ -61,6 +61,7 @@ if ((kcb = malloc(sizeof(struct kcb))) != NULL) { bzero(kcb, sizeof(struct kcb)); kcb->kcb_kse = kse; + kcb->kcb_self = kcb; } return (kcb); } ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#30 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.84 2003/08/10 22:30:20 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.86 2003/08/13 01:49:07 davidxu Exp $"); #include #include @@ -162,16 +162,6 @@ static void kse_gc(struct pthread *thread); static void kseg_gc(struct pthread *thread); -static __inline void -kse_set_curthread(struct kse *kse, struct pthread *td) -{ - kse->k_curthread = td; - if (td != NULL) - _tcb_set(kse->k_kcb, td->tcb); - else - _tcb_set(kse->k_kcb, NULL); -} - static void __inline thr_accounting(struct pthread *thread) { @@ -681,11 +671,12 @@ /* Switchout the current thread. */ kse_switchout_thread(curkse, curthread); + _tcb_set(curkse->k_kcb, NULL); /* Choose another thread to run. */ td = KSE_RUNQ_FIRST(curkse); KSE_RUNQ_REMOVE(curkse, td); - kse_set_curthread(curkse, td); + curkse->k_curthread = td; /* * Make sure the current thread's kse points to @@ -708,7 +699,8 @@ td->curframe = NULL; /* - * Continue the thread at its current frame: + * Continue the thread at its current frame. + * Note: TCB is set in _thread_switch */ ret = _thread_switch(curkse->k_kcb, td->tcb, 0); /* This point should not be reached. */ @@ -791,7 +783,14 @@ * to be cleared. */ (void)_kse_critical_enter(); - } + } else { + /* + * Bound thread always has tcb set, this prevent some + * code from blindly setting bound thread tcb to NULL, + * buggy code ? + */ + _tcb_set(curkse->k_kcb, curthread->tcb); + } curthread->critical_yield = 0; curthread->need_switchout = 0; @@ -958,13 +957,19 @@ curkse->k_flags |= KF_INITIALIZED; } + /* + * No current thread anymore, calling _get_curthread in UTS + * should dump core + */ + _tcb_set(curkse->k_kcb, NULL); + /* This may have returned from a kse_release(). */ if (KSE_WAITING(curkse)) { DBG_MSG("Entered upcall when KSE is waiting."); KSE_CLEAR_WAIT(curkse); } - /*If this is an upcall; take the scheduler lock. */ + /* If this is an upcall; take the scheduler lock. */ if (curkse->k_switch == 0) KSE_SCHED_LOCK(curkse, curkse->k_kseg); curkse->k_switch = 0; @@ -1022,7 +1027,7 @@ curthread->active = 1; if ((curthread->flags & THR_FLAGS_IN_RUNQ) != 0) KSE_RUNQ_REMOVE(curkse, curthread); - kse_set_curthread(curkse, curthread); + curkse->k_curthread = curthread; curthread->kse = curkse; DBG_MSG("Continuing thread %p in critical region\n", curthread); @@ -1034,7 +1039,7 @@ } else if ((curthread->flags & THR_FLAGS_IN_RUNQ) == 0) kse_switchout_thread(curkse, curthread); - kse_set_curthread(curkse, NULL); + curkse->k_curthread = NULL; kse_wakeup_multi(curkse); @@ -1080,7 +1085,7 @@ /* * Make the selected thread the current thread. */ - kse_set_curthread(curkse, curthread); + curkse->k_curthread = curthread; /* * Make sure the current thread's kse points to this kse. @@ -1544,7 +1549,7 @@ * previous KSE so that it (the KSE) * doesn't think it is still active. */ - kse_set_curthread(thread->kse, NULL); + thread->kse->k_curthread = NULL; thread->active = 0; } } ==== //depot/projects/ia64/rescue/rescue/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.15 2003/08/01 09:04:32 gordon Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.16 2003/08/12 14:33:48 harti Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -102,8 +102,8 @@ # headers in addition to the standard 'paths.h' header. # CRUNCH_SRCDIRS+= sbin -CRUNCH_PROGS_sbin= atm atacontrol badsect bsdlabel camcontrol \ - ccdconfig clri devfs dmesg dump \ +CRUNCH_PROGS_sbin= atm atmconfig atacontrol badsect bsdlabel \ + camcontrol ccdconfig clri devfs dmesg dump \ dumpfs dumpon fore_dnld fsck fsck_ffs fsck_msdosfs fsdb \ fsirand gbde ifconfig ilmid init \ kldconfig kldload kldstat kldunload ldconfig \ @@ -153,6 +153,7 @@ .endif CRUNCH_SRCDIR_atm= $(.CURDIR)/../../sbin/atm/atm +CRUNCH_SRCDIR_atmconfig= $(.CURDIR)/../../sbin/atm/atmconfig CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery ==== //depot/projects/ia64/sbin/atm/Makefile#3 (text+ko) ==== @@ -20,9 +20,10 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/sbin/atm/Makefile,v 1.3 2003/08/03 15:17:27 obrien Exp $ +# @(#) $FreeBSD: src/sbin/atm/Makefile,v 1.4 2003/08/12 14:25:56 harti Exp $ SUBDIR= atm \ + atmconfig \ fore_dnld \ ilmid ==== //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#6 (text+ko) ==== @@ -28,7 +28,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/sbin/mount_msdosfs/mount_msdosfs.8,v 1.26 2003/08/09 04:21:18 bms Exp $ +.\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.27 2003/08/12 20:06:55 trhodes Exp $ .\" .Dd April 7, 1994 .Dt MOUNT_MSDOSFS 8 @@ -42,6 +42,7 @@ .Op Fl u Ar uid .Op Fl g Ar gid .Op Fl m Ar mask +.Op Fl M Ar mask .Op Fl s .Op Fl l .Op Fl 9 @@ -104,14 +105,28 @@ others should only have read and execute permissions. See .Xr chmod 1 -for more information about octal file modes.) +for more information about octal file modes. Only the nine low-order bits of .Ar mask are used. +The value of +.Ar -M +is used if it is supplied and +.Ar -m +is omitted. The default .Ar mask is taken from the directory on which the file system is being mounted. +.It Fl M Ar mask +Specify the maximum file permissions for directories +in the file system. +The value of +.Ar -m +is used if it is supplied and +.Ar -M +is omitted. +See the previous option's description for details. .It Fl s Force behaviour to ignore and not generate Win'95 long filenames. ==== //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.24 2002/08/03 16:03:19 mux Exp $"; + "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.25 2003/08/12 20:06:55 trhodes Exp $"; #endif /* not lint */ #include @@ -88,14 +88,14 @@ { struct msdosfs_args args; struct stat sb; - int c, mntflags, set_gid, set_uid, set_mask; + int c, mntflags, set_gid, set_uid, set_mask, set_dirmask; char *dev, *dir, mntpath[MAXPATHLEN]; - mntflags = set_gid = set_uid = set_mask = 0; + mntflags = set_gid = set_uid = set_mask = set_dirmask = 0; (void)memset(&args, '\0', sizeof(args)); args.magic = MSDOSFS_ARGSMAGIC; - while ((c = getopt(argc, argv, "sl9u:g:m:o:L:W:")) != -1) { + while ((c = getopt(argc, argv, "sl9u:g:m:M:o:L:W:")) != -1) { switch (c) { #ifdef MSDOSFSMNT_GEMDOSFS case 'G': @@ -123,6 +123,10 @@ args.mask = a_mask(optarg); set_mask = 1; break; + case 'M': + args.dirmask = a_mask(optarg); + set_dirmask = 1; + break; case 'L': load_ultable(&args, optarg); args.flags |= MSDOSFSMNT_ULTABLE; @@ -144,6 +148,15 @@ if (optind + 2 != argc) usage(); + if (set_mask && !set_dirmask) { + args.dirmask = args.mask; + set_dirmask = 1; + } + else if (set_dirmask && !set_mask) { + args.mask = args.dirmask; + set_mask = 1; + } + dev = argv[optind]; dir = argv[optind + 1]; @@ -169,7 +182,8 @@ if (!set_gid) args.gid = sb.st_gid; if (!set_mask) - args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); + args.mask = args.dirmask = + sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); } if (mount("msdosfs", mntpath, mntflags, &args) < 0) ==== //depot/projects/ia64/sbin/nfsiod/nfsiod.8#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)nfsiod.8 8.2 (Berkeley) 2/22/94 -.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.16 2002/08/10 20:19:04 mux Exp $ +.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.17 2003/08/12 20:01:10 ceri Exp $ .\" .Dd September 22, 1994 .Dt NFSIOD 8 @@ -46,7 +46,7 @@ .Sh DESCRIPTION The .Nm -utility is a kernel process which run on an +utility is a kernel process which runs on an .Tn NFS client machine to service asynchronous I/O requests to its server. It improves performance but is not required for correct operation. ==== //depot/projects/ia64/share/man/man4/natmip.4#5 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.4 2003/07/15 12:07:45 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.5 2003/08/12 14:20:32 harti Exp $ .\" -.Dd June 13, 2003 +.Dd August 11, 2003 .Dt NATMIP 4 .Os .Sh NAME @@ -19,15 +19,103 @@ .Pp .Dl # ifconfig en0 128.252.200.1 netmask 0xffffff00 up .Pp -A PVC is added with the +IP routing is done with special interface routes (routes with directly +reachable destinations) with a link layer gateway address. +The link layer address specifies the ATM interface through which the +destination can be reached, the virtual channel that connects to the +destination and the ATM characteristics of this channel. +The address part of the link layer address (see +.Xr link_addr 3 ) +consists of a fixed part (the first 5 bytes) and a part that +depends on the kind of the PVC (UBR, CBR, VBR, ABR). Multi-byte values +are big-endian encoded: the bytes with the lower numbers contain the +higher order bits. +.Bl -tag -width "bytes 12...12" -offset indent +.It byte 0 +Is a flag byte. Currently only flag 0x20 is used. +When set, all IP frames are LLC/SNAP encapsulated before putting them into +an AAL5 frame. +Setting this flag is recommended and allows interoperability with other +CLIP implementations. +Note that BPF works only with LLC/SNAP encapsulation. +.It byte 1 +This is the VPI of the channel. +.It bytes 2...3 +VCI of the channel. Must not be zero. +.It byte 4 +Traffic type. One of 0 (UBR), 1 (CBR), 2 (ABR), 3 (VBR). +.El +.Pp +The variable part for UBR connections may be either empty or three bytes: +.Bl -tag -width "bytes 12...12" -offset indent +.It bytes 5...7 +Specifies the peak cell rate for UBR. +.El +.Pp +The variable part for CBR connections must be three bytes: +.Bl -tag -width "bytes 12...12" -offset indent +.It bytes 5...7 +Specifies the peak cell rate for CBR. +.El +.Pp +The variable part for VBR connections must be 9 bytes long and specifies three +values: +.Bl -tag -width "bytes 12...12" -offset indent +.It bytes 5...7 +Specifies the peak cell rate for VBR. +.It bytes 8...10 +This is the sustainable cell rate. +.It bytes 11...13 +The maximum burst size. +.El +.Pp +The variable part for ABR connections must be 19 bytes long and specifies the +following values: +.Bl -tag -width "bytes 12...12" -offset indent +.It bytes 5...7 +Specifies the peak cell rate for ABR. +.It bytes 8...10 +The minimum cell rate. +.It bytes 11...13 +The initial cell rate. +.It bytes 14...16 +The transient buffer exposure. +.It byte 17 +The NRM value. +.It byte 18 +The TRM value. +.It bytes 19...20 +The ADTF value. +.It byte 21 +The rate increase factor (RIF). +.It byte 22 +The rate decrease factor (RDF). +.It byte 23 +The cutoff decrease factor (CDF). +.El +.Pp +To add a PVC the .Dq route -utility: +utility can be used: .Pp -.Dl # route add -iface -link en0:z.0.x.y +.Ic # route add -iface +.Ar +.Ic -link +.Ar Ns Ic \&: Ns Ar .Pp -where x and y are the hexadecimal byte encoding of the VCI to use, -and z is the byte encoding of the following flags: +The +.Ar +is the ATM interface through which +.Ar +can be reached and +.Ar +is the link layer address as a string of dot-separated, hexadecimal bytes. .Pp +NATM also supports the old, original format. This consists of 4 byte +link layer addresses (and the channels are implicit UBR): +.Bl -tag -width "bytes 12...12" -offset indent +.It byte 0 +Flags: .Bl -tag -width "0x02" -offset indent -compact .It 0x01 use AAL5. @@ -38,40 +126,48 @@ Thus, parameter 3 means AAL5 and LLC/SNAP encapsulation (this is the required setting for interworking with other CLIP clients). Note that BPF works only with LLC/SNAP encapsulation. +.It byte 1 +VPI for the channel +.It bytes 2...3 +VCI for the channel +.El .Sh EXAMPLES Suppose you have 3 hosts 128.252.200.1, 128.252.200.2 and 128.252.200.3 connected by ATM through PVCs: .Pp .Bl -item -offset indent -compact .It -between 128.252.200.1 and 128.252.200.2: 0xc9 +between 128.252.200.1 and 128.252.200.2: 0xc9 UBR .It -between 128.252.200.1 and 128.252.200.3: 0xca +between 128.252.200.1 and 128.252.200.3: 0xca VBR .It -between 128.252.200.2 and 128.252.200.3: 0xcb +between 128.252.200.2 and 128.252.200.3: 0xcb CBR .El .Pp +The parameters for the VBR channel are: PCR 50000, SCR 10000, MBS 10. +The peak cell rate for the CBR channel is 100000. +.Pp To enable the links use the following commands: .Pp on host 128.252.200.1: .Bd -literal -offset indent -compact # ifconfig en0 128.252.200.1 netmask 0xffffff00 up -# route add -iface 128.252.200.2 -link en0:3.0.0.c9 -# route add -iface 128.252.200.3 -link en0:3.0.0.ca +# route add -iface 128.252.200.2 -link en0:3.0.0.c9.0 +# route add -iface 128.252.200.3 -link en0:3.0.0.ca.3.0.c3.50.0.27.10.0.0.a .Ed .Pp on host 128.252.200.2: .Bd -literal -offset indent -compact # ifconfig en0 128.252.200.2 netmask 0xffffff00 up -# route add -iface 128.252.200.1 -link en0:3.0.0.c9 -# route add -iface 128.252.200.3 -link en0:3.0.0.cb +# route add -iface 128.252.200.1 -link en0:3.0.0.c9.0 +# route add -iface 128.252.200.3 -link en0:3.0.0.cb.1.1.86.a0 .Ed .Pp on host 128.252.200.3: .Bd -literal -offset indent -compact # ifconfig en0 128.252.200.3 netmask 0xffffff00 up -# route add -iface 128.252.200.1 -link en0:3.0.0.ca -# route add -iface 128.252.200.2 -link en0:3.0.0.cb +# route add -iface 128.252.200.1 -link en0:3.0.0.ca.3.0.c3.50.0.27.10.0.0.a +# route add -iface 128.252.200.2 -link en0:3.0.0.cb.1.1.86.a0 .Ed .Pp This can also be done in @@ -82,8 +178,8 @@ network_interfaces="lo0 en0" ifconfig_en0="inet 128.252.200.1 netmask 255.255.255.0" static_routes="host2 host3" -route_host2="-iface 128.252.200.2 -link en0:3.0.0.c9" -route_host3="-iface 128.252.200.3 -link en0:3.0.0.ca" +route_host2="-iface 128.252.200.2 -link en0:3.0.0.c9.0" +route_host3="-iface 128.252.200.3 -link en0:3.0.0.ca.3.0.c3.50.0.27.10.0.0.a" .Ed .Pp on host 128.252.200.2: @@ -91,8 +187,8 @@ network_interfaces="lo0 en0" ifconfig_en0="inet 128.252.200.2 netmask 255.255.255.0" static_routes="host1 host3" -route_host1="-iface 128.252.200.1 -link en0:3.0.0.c9" -route_host3="-iface 128.252.200.3 -link en0:3.0.0.cb" +route_host1="-iface 128.252.200.1 -link en0:3.0.0.c9.0" +route_host3="-iface 128.252.200.3 -link en0:3.0.0.cb.1.1.86.a0" .Ed .Pp on host 128.252.200.3: @@ -100,8 +196,8 @@ network_interfaces="lo0 en0" ifconfig_en0="inet 128.252.200.3 netmask 255.255.255.0" static_routes="host1 host2" -route_host1="-iface 128.252.200.1 -link en0:3.0.0.ca" -route_host2="-iface 128.252.200.2 -link en0:3.0.0.cb" +route_host1="-iface 128.252.200.1 -link en0:3.0.0.ca.3.0.c3.50.0.27.10.0.0.a" +route_host2="-iface 128.252.200.2 -link en0:3.0.0.cb.1.1.86.a0" .Ed .Sh SEE ALSO .Xr en 4 , ==== //depot/projects/ia64/sys/alpha/alpha/critical.c#4 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 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. */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $"); #include #include ==== //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.47 2003/08/12 19:33:35 jhb Exp $"); #include "opt_kstack_pages.h" @@ -208,7 +208,7 @@ /* ok, now grab sched_lock and enter the scheduler */ mtx_lock_spin(&sched_lock); - cpu_throw(); /* doesn't return */ + cpu_throw(NULL, choosethread()); /* doesn't return */ panic("scheduler returned us to %s", __func__); } ==== //depot/projects/ia64/sys/alpha/alpha/swtch.s#4 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.33 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.34 2003/08/12 19:33:35 jhb Exp $ */ #define _LOCORE @@ -49,7 +49,7 @@ /* * savectx: save process context, i.e. callee-saved registers * - * Note that savectx() only works for processes other than curthread, + * Note that savectx() only works for threads other than curthread, * since cpu_switch will copy over the info saved here. (It _can_ * sanely be used for curthread iff cpu_switch won't be called again, e.g. * from if called from boot().) @@ -88,58 +88,67 @@ /* * cpu_throw() - * Switch to a new task discarding our current state. + * Switch to a new thread discarding our current state. + * + * Arguments: + * a0 'struct thread *' of the old thread + * a1 'struct thread *' of the new thread */ LEAF(cpu_throw, 0) LDGP(pv) - mov zero, s0 /* ensure newproc != oldproc */ CALL(Lcs1) END(cpu_throw) /* * cpu_switch() - * Find the highest priority process and resume it. + * Switch to a new thread saving the current state in the old thread. + * + * Arguments: + * a0 'struct thread *' of the old thread + * a1 'struct thread *' of the new thread */ LEAF(cpu_switch, 1) LDGP(pv) /* do an inline savectx(), to save old context */ - ldq a0, PC_CURTHREAD(pcpup) - ldq a1, TD_PCB(a0) + ldq a2, TD_PCB(a0) /* NOTE: ksp is stored by the swpctx */ - stq s0, PCB_CONTEXT+(0 * 8)(a1) /* store s0 - s6 */ - stq s1, PCB_CONTEXT+(1 * 8)(a1) - stq s2, PCB_CONTEXT+(2 * 8)(a1) - stq s3, PCB_CONTEXT+(3 * 8)(a1) - stq s4, PCB_CONTEXT+(4 * 8)(a1) - stq s5, PCB_CONTEXT+(5 * 8)(a1) - stq s6, PCB_CONTEXT+(6 * 8)(a1) - stq ra, PCB_CONTEXT+(7 * 8)(a1) /* store ra */ + stq s0, PCB_CONTEXT+(0 * 8)(a2) /* store s0 - s6 */ + stq s1, PCB_CONTEXT+(1 * 8)(a2) + stq s2, PCB_CONTEXT+(2 * 8)(a2) + stq s3, PCB_CONTEXT+(3 * 8)(a2) + stq s4, PCB_CONTEXT+(4 * 8)(a2) + stq s5, PCB_CONTEXT+(5 * 8)(a2) + stq s6, PCB_CONTEXT+(6 * 8)(a2) + stq ra, PCB_CONTEXT+(7 * 8)(a2) /* store ra */ call_pal PAL_OSF1_rdps /* NOTE: doesn't kill a0 */ - stq v0, PCB_CONTEXT+(8 * 8)(a1) /* store ps, for ipl */ + stq v0, PCB_CONTEXT+(8 * 8)(a2) /* store ps, for ipl */ mov a0, s0 /* s0 = old curthread */ - mov a1, s1 /* s1 = old pcb */ + mov a2, s1 /* s1 = old pcb */ + + /* + * Deactivate the old address space before activating the + * new one. We need to do this before activating the + * new thread's address space in the event that new + * thread is using the same vmspace as the old. If we + * do this after we activate, then we might end up + * incorrectly marking the pmap inactive! + * + * We don't deactivate if we came here from switch_exit + * (old pmap no longer exists; vmspace has been freed). + * oldproc will be NULL in this case. We have actually + * taken care of calling pmap_deactivate() in cpu_exit(), + * before the vmspace went away. + */ + beq a0, sw1 + CALL(pmap_deactivate) /* pmap_deactivate(oldthread) */ sw1: br pv, Lcs1 Lcs1: LDGP(pv) - CALL(choosethread) /* can't return NULL */ - mov v0, s2 /* s2 = new thread */ + mov a1, s2 /* s2 = new thread */ ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ - /* - * Check to see if we're switching to ourself. If we are, - * don't bother loading the new context. - * - * Note that even if we re-enter cpu_switch() from idle(), - * s0 will still contain the old curthread value because any - * users of that register between then and now must have - * saved it. Also note that switch_exit() ensures that - * s0 is clear before jumping here to find a new process. - */ - cmpeq s0, s2, t0 /* oldthread == newthread? */ - bne t0, Lcs7 /* Yes! Skip! */ - #ifdef SMP /* * Save fp state if we have some. @@ -150,27 +159,7 @@ #endif /* - * Deactivate the old address space before activating the - * new one. We need to do this before activating the - * new process's address space in the event that new - * process is using the same vmspace as the old. If we - * do this after we activate, then we might end up - * incorrectly marking the pmap inactive! - * - * We don't deactivate if we came here from switch_exit - * (old pmap no longer exists; vmspace has been freed). - * oldproc will be NULL in this case. We have actually - * taken care of calling pmap_deactivate() in cpu_exit(), - * before the vmspace went away. - */ - beq s0, Lcs6 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 13 10:51:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D145C37B401; Wed, 13 Aug 2003 10:51:29 -0700 (PDT) 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 5763A37B404 for ; Wed, 13 Aug 2003 10:51:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 639D743F75 for ; Wed, 13 Aug 2003 10:51:28 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7DHpS0U052794 for ; Wed, 13 Aug 2003 10:51:28 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7DHpRem052791 for perforce@freebsd.org; Wed, 13 Aug 2003 10:51:27 -0700 (PDT) Date: Wed, 13 Aug 2003 10:51:27 -0700 (PDT) Message-Id: <200308131751.h7DHpRem052791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 36048 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: Wed, 13 Aug 2003 17:51:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=36048 Change 36048 by cvance@cvance_osx_laptop on 2003/08/13 10:50:57 wait_queue_t is a pointer, not a structure, so make sure it gets allocated before initialization. The Mach wait_queue_alloc() function does both. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#4 (text+ko) ==== @@ -44,9 +44,9 @@ { bzero(cvp, sizeof(*cvp)); - if (wait_queue_init(cvp->cv_wait_queue, SYNC_POLICY_FIFO) != - KERN_SUCCESS) - panic("cv_init: wait_queue_init failed"); + cvp->cv_wait_queue = wait_queue_alloc(SYNC_POLICY_FIFO); + if (cvp->cv_wait_queue == WAIT_QUEUE_NULL) + panic("cv_init: wait_queue_alloc failed"); } void @@ -61,6 +61,7 @@ if (!wait_queue_is_queue(cvp->cv_wait_queue)) panic("cv_destroy: !wait_queue_is_queue"); #endif + wait_queue_free(cvp->cv_wait_queue); bzero(cvp, sizeof(*cvp)); } From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:14:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544BF37B404; Thu, 14 Aug 2003 09:14:08 -0700 (PDT) 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 1680D37B401 for ; Thu, 14 Aug 2003 09:14:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F15E43FE1 for ; Thu, 14 Aug 2003 09:14:07 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGE70U056121 for ; Thu, 14 Aug 2003 09:14:07 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGE6MF056108 for perforce@freebsd.org; Thu, 14 Aug 2003 09:14:06 -0700 (PDT) Date: Thu, 14 Aug 2003 09:14:06 -0700 (PDT) Message-Id: <200308141614.h7EGE6MF056108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 36098 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, 14 Aug 2003 16:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=36098 Change 36098 by cvance@cvance_osx_laptop on 2003/08/14 09:13:10 Add Libkvm and adv_cmds directories - we'll need these to rebuild /bin/ps Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_file.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_geterr.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getfiles.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getprocs.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_hp300.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_luna68k.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_mips.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_next.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_nlist.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_open.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_private.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_read.3#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_sparc.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile.include#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/adv_cmds.rtf#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/lprint.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/net.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/sprint.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/fingerd.8#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/fingerd.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/last.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/last.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/md.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Japanese#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/POSIX#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/ldef.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/lex.l#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/mklocale.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/README.locale_name#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ja_JP.EUC.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ko_KR.EUC.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.US-ASCII.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/zh_CN.EUC.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/yacc.y#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/fmt.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/keyword.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/nlist.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/tasks.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/pstat.8#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/pstat.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/cchar.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/gfmt.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/key.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/modes.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/tty.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/tty.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/whois.1#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/whois.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:14:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 804F037B401; Thu, 14 Aug 2003 09:14:09 -0700 (PDT) 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 BA10137B420 for ; Thu, 14 Aug 2003 09:14:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D330A43FE3 for ; Thu, 14 Aug 2003 09:14:07 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGE70U056142 for ; Thu, 14 Aug 2003 09:14:07 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGE7kd056129 for perforce@freebsd.org; Thu, 14 Aug 2003 09:14:07 -0700 (PDT) Date: Thu, 14 Aug 2003 09:14:07 -0700 (PDT) Message-Id: <200308141614.h7EGE7kd056129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36099 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, 14 Aug 2003 16:14:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=36099 Change 36099 by sam@sam_ebb on 2003/08/14 09:13:53 Revamp output path for management frames to eliminate redundant locking that causes problems and to correct reference counting bogosity that occurs when stations are timed out due to inactivity (in AP mode). On output the refcnt'd node is stashed in the pkthdr's recvif field (yech) and retrieved by the driver. This eliminates an unref/ref scenario and related node table unlock/lock due to the driver looking up the node. This is important particularly for when stations are timed out as this causes a lock order reversal that can result in a deadlock. As a byproduct we also reduce the overhead for sending management frames (minimal). Additional fallout from this is a change to ieee80211_encap to return a refcn't node for tieing to the outbound frame. Node refcnts are not reclaimed until after a frame is completely processed (e.g. in the tx interrupt handler). This is especially important for timedout stations as this deref will be the final one causing the node entry to be reclaimed. Additional semi-related changes: o replace m_copym use with m_copypacket (optimization) o add assert to verify ic_bss is never free'd during normal operation o add comments explaining calling conventions by drivers for frames going in each direction o remove extraneous code that "cannot be executed" (e.g. because pointers may never be null) Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#6 edit .. //depot/projects/netperf/sys/dev/wi/if_wi.c#3 edit .. //depot/projects/netperf/sys/net80211/ieee80211_input.c#3 edit .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#4 edit .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#2 edit .. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#2 edit .. //depot/projects/netperf/sys/net80211/ieee80211_proto.h#3 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -706,7 +706,7 @@ /* * Encapsulate the packet in prep for transmission. */ - m = ieee80211_encap(ifp, m); + m = ieee80211_encap(ifp, m, &ni); if (m == NULL) { DPRINTF(("ath_start: encapsulation failure\n")); sc->sc_stats.ast_tx_encap++; @@ -716,6 +716,18 @@ if (ic->ic_flags & IEEE80211_F_WEPON) wh->i_fc[1] |= IEEE80211_FC1_WEP; } else { + /* + * Hack! The referenced node pointer is in the + * rcvif field of the packet header. This is + * placed there by ieee80211_mgmt_output because + * we need to hold the reference with the frame + * and there's no other way (other than packet + * tags which we consider too expensive to use) + * to pass it along. + */ + ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; + m->m_pkthdr.rcvif = NULL; + wh = mtod(m, struct ieee80211_frame *); if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) { @@ -735,26 +747,6 @@ if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m); - if (ic->ic_opmode != IEEE80211_M_STA) { - ni = ieee80211_find_node(ic, wh->i_addr1); - if (ni == NULL) { - /* - * When not in station mode the destination - * address should always be in the node table - * unless this is a multicast/broadcast frame. - */ - if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && - (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == - IEEE80211_FC0_TYPE_DATA) { - m_freem(m); - sc->sc_stats.ast_tx_nonode++; - goto bad; - } - ni = ic->ic_bss; - } - } else - ni = ic->ic_bss; - if (sc->sc_drvbpf) { struct mbuf *mb; @@ -785,6 +777,8 @@ TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); mtx_unlock(&sc->sc_txbuflock); ifp->if_oerrors++; + if (ni && ni != ic->ic_bss) + ieee80211_free_node(ic, ni); continue; } @@ -1745,7 +1739,7 @@ DPRINTF2(("ath_tx_start: m %p len %u\n", m0, pktlen)); bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); bf->bf_m = m0; - bf->bf_node = ni; + bf->bf_node = ni; /* NB: held reference */ /* setup descriptors */ ds = bf->bf_desc; @@ -1929,7 +1923,8 @@ struct ath_softc *sc = arg; struct ath_hal *ah = sc->sc_ah; struct ath_buf *bf; - struct ifnet *ifp = &sc->sc_ic.ic_if; + struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; struct ath_desc *ds; struct ieee80211_node *ni; struct ath_node *an; @@ -1984,6 +1979,15 @@ sc->sc_stats.ast_tx_longretry += lr; if (sr + lr) an->an_tx_retr++; + /* + * Reclaim reference to node. + * + * NB: the node may be reclaimed here if, for example + * this is a DEAUTH message that was sent and the + * node was timed out due to inactivity. + */ + if (ni != ic->ic_bss) + ieee80211_free_node(ic, ni); } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTWRITE); ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#3 (text+ko) ==== @@ -834,10 +834,11 @@ { struct wi_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_node *ni; struct ieee80211_frame *wh; struct mbuf *m0; struct wi_frame frmhdr; - int cur, fid, off; + int cur, fid, off, error; WI_LOCK_DECL(); WI_LOCK(sc); @@ -861,6 +862,18 @@ break; } IF_DEQUEUE(&ic->ic_mgtq, m0); + /* + * Hack! The referenced node pointer is in the + * rcvif field of the packet header. This is + * placed there by ieee80211_mgmt_output because + * we need to hold the reference with the frame + * and there's no other way (other than packet + * tags which we consider too expensive to use) + * to pass it along. + */ + ni = (struct ieee80211_node *) m0->m_pkthdr.rcvif; + m0->m_pkthdr.rcvif = NULL; + m_copydata(m0, 4, ETHER_ADDR_LEN * 2, (caddr_t)&frmhdr.wi_ehdr); frmhdr.wi_ehdr.ether_type = 0; @@ -883,26 +896,12 @@ BPF_MTAP(ifp, m0); #endif - if ((m0 = ieee80211_encap(ifp, m0)) == NULL) { + m0 = ieee80211_encap(ifp, m0, &ni); + if (m0 == NULL) { ifp->if_oerrors++; continue; } wh = mtod(m0, struct ieee80211_frame *); - if (ic->ic_opmode == IEEE80211_M_HOSTAP && - !IEEE80211_IS_MULTICAST(wh->i_addr1) && - (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == - IEEE80211_FC0_TYPE_DATA) { - struct ieee80211_node *ni = - ieee80211_find_node(ic, wh->i_addr1); - int err = (ni == NULL || ni->ni_associd == 0); - if (ni != NULL) - ieee80211_unref_node(&ni); - if (err) { - m_freem(m0); - ifp->if_oerrors++; - continue; - } - } if (ic->ic_flags & IEEE80211_F_WEPON) wh->i_fc[1] |= IEEE80211_FC1_WEP; @@ -916,6 +915,8 @@ (wh->i_fc[1] & IEEE80211_FC1_WEP)) { if ((m0 = ieee80211_wep_crypt(ifp, m0, 1)) == NULL) { ifp->if_oerrors++; + if (ni && ni != ic->ic_bss) + ieee80211_free_node(ic, ni); continue; } frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_NOCRYPT); @@ -943,13 +944,15 @@ wi_dump_pkt(&frmhdr, NULL, -1); fid = sc->sc_txd[cur].d_fid; off = sizeof(frmhdr); - if (wi_write_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) != 0 || - wi_mwrite_bap(sc, fid, off, m0, m0->m_pkthdr.len) != 0) { + error = wi_write_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) != 0 + || wi_mwrite_bap(sc, fid, off, m0, m0->m_pkthdr.len) != 0; + m_freem(m0); + if (ni && ni != ic->ic_bss) + ieee80211_free_node(ic, ni); + if (error) { ifp->if_oerrors++; - m_freem(m0); continue; } - m_freem(m0); sc->sc_txd[cur].d_len = off; if (sc->sc_txcur == cur) { if (wi_cmd(sc, WI_CMD_TX | WI_RECLAIM, fid, 0, 0)) { ==== //depot/projects/netperf/sys/net80211/ieee80211_input.c#3 (text+ko) ==== @@ -233,7 +233,7 @@ if (ic->ic_opmode == IEEE80211_M_HOSTAP) { eh = mtod(m, struct ether_header *); if (ETHER_IS_MULTICAST(eh->ether_dhost)) { - m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT); + m1 = m_copypacket(m, M_DONTWAIT); if (m1 == NULL) ifp->if_oerrors++; else @@ -741,10 +741,11 @@ IEEE80211_DPRINTF(("%s: rate negotiation failed: %s\n", __func__,ether_sprintf(wh->i_addr2))); } else { - IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_PROBE_RESP, - 0); + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); } if (allocbs) { + /* XXX just use free? */ if (ic->ic_opmode == IEEE80211_M_HOSTAP) ieee80211_free_node(ic, ni); else @@ -798,13 +799,12 @@ allocbs = 1; } else allocbs = 0; - IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, 2); + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_AUTH, 2); if (ifp->if_flags & IFF_DEBUG) if_printf(ifp, "station %s %s authenticated\n", (allocbs ? "newly" : "already"), ether_sprintf(ni->ni_macaddr)); - if (allocbs) - ieee80211_unref_node(&ni); break; case IEEE80211_M_STA: @@ -912,7 +912,8 @@ IEEE80211_DPRINTF(("%s: capability mismatch %x for %s\n", __func__, capinfo, ether_sprintf(wh->i_addr2))); ni->ni_associd = 0; - IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_CAPINFO); + IEEE80211_SEND_MGMT(ic, ni, resp, + IEEE80211_STATUS_CAPINFO); return; } ieee80211_setup_rates(ic, ni, rates, xrates, @@ -922,7 +923,8 @@ IEEE80211_DPRINTF(("%s: rate unmatch for %s\n", __func__, ether_sprintf(wh->i_addr2))); ni->ni_associd = 0; - IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE); + IEEE80211_SEND_MGMT(ic, ni, resp, + IEEE80211_STATUS_BASIC_RATE); return; } ni->ni_rssi = rssi; ==== //depot/projects/netperf/sys/net80211/ieee80211_node.c#4 (text+ko) ==== @@ -507,6 +507,8 @@ void ieee80211_free_node(struct ieee80211com *ic, struct ieee80211_node *ni) { + KASSERT(ni != ic->ic_bss, ("freeing ic_bss")); + /* XXX need equivalent of atomic_dec_and_test */ atomic_subtract_int(&ni->ni_refcnt, 1); if (atomic_cmpset_int(&ni->ni_refcnt, 0, 1)) { @@ -534,21 +536,22 @@ mtx_lock(&ic->ic_nodelock); for (ni = TAILQ_FIRST(&ic->ic_node); ni != NULL;) { - if (++ni->ni_inact <= IEEE80211_INACT_MAX) { - ni = TAILQ_NEXT(ni, ni_list); - continue; - } - /* NB: don't honor reference count */ - IEEE80211_DPRINTF(("station %s timed out " + if (++ni->ni_inact > IEEE80211_INACT_MAX) { + IEEE80211_DPRINTF(("station %s timed out " "due to inactivity (%u secs)\n", ether_sprintf(ni->ni_macaddr), ni->ni_inact)); - nextbs = TAILQ_NEXT(ni, ni_list); - IEEE80211_SEND_MGMT(ic, ni, - IEEE80211_FC0_SUBTYPE_DEAUTH, - IEEE80211_REASON_AUTH_EXPIRE); - _ieee80211_free_node(ic, ni); - ni = nextbs; + nextbs = TAILQ_NEXT(ni, ni_list); + /* + * Send a deauthenticate frame. + */ + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_DEAUTH, + IEEE80211_REASON_AUTH_EXPIRE); + ieee80211_free_node(ic, ni); + ni = nextbs; + } else + ni = TAILQ_NEXT(ni, ni_list); } if (!TAILQ_EMPTY(&ic->ic_node)) ic->ic_inact_timer = IEEE80211_INACT_WAIT; ==== //depot/projects/netperf/sys/net80211/ieee80211_output.c#2 (text+ko) ==== @@ -66,20 +66,41 @@ #include #endif -int +/* + * Send a management frame to the specified node. The node pointer + * must have a reference as the pointer will be passed to the driver + * and potentially held for a long time. If the frame is successfully + * dispatched to the driver, then it is responsible for freeing the + * reference (and potentially free'ing up any associated storage). + */ +static int ieee80211_mgmt_output(struct ifnet *ifp, struct ieee80211_node *ni, struct mbuf *m, int type) { struct ieee80211com *ic = (void *)ifp; struct ieee80211_frame *wh; - /* XXX this probably shouldn't be permitted */ - KASSERT(ni != NULL, ("%s: null node", __func__)); + KASSERT(ni != NULL, ("null node")); ni->ni_inact = 0; + /* + * Yech, hack alert! We want to pass the node down to the + * driver's start routine. If we don't do so then the start + * routine must immediately look it up again and that can + * cause a lock order reversal if, for example, this frame + * is being sent because the station is being timedout and + * the frame being sent is a DEAUTH message. We could stick + * this in an m_tag and tack that on to the mbuf. However + * that's rather expensive to do for every frame so instead + * we stuff it in the rcvif field since outbound frames do + * not (presently) use this. + */ M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); if (m == NULL) return ENOMEM; + KASSERT(m->m_pkthdr.rcvif == NULL, ("rcvif not null")); + m->m_pkthdr.rcvif = (void *)ni; + wh = mtod(m, struct ieee80211_frame *); wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT | type; wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; @@ -106,31 +127,57 @@ ether_sprintf(ni->ni_macaddr), ieee80211_chan2ieee(ic, ni->ni_chan)); } + IF_ENQUEUE(&ic->ic_mgtq, m); ifp->if_timer = 1; (*ifp->if_start)(ifp); return 0; } +/* + * Encapsulate an outbound data frame. The mbuf chain is updated and + * a reference to the destination node is returned. If an error is + * encountered NULL is returned and the node reference will also be NULL. + * + * NB: The caller is responsible for free'ing a returned node reference. + * The convention is ic_bss is not reference counted; the caller must + * maintain that. + */ struct mbuf * -ieee80211_encap(struct ifnet *ifp, struct mbuf *m) +ieee80211_encap(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node **pni) { struct ieee80211com *ic = (void *)ifp; struct ether_header eh; struct ieee80211_frame *wh; + struct ieee80211_node *ni = NULL; struct llc *llc; - struct ieee80211_node *ni; if (m->m_len < sizeof(struct ether_header)) { m = m_pullup(m, sizeof(struct ether_header)); - if (m == NULL) - return NULL; + if (m == NULL) { + /* XXX statistic */ + goto bad; + } } memcpy(&eh, mtod(m, caddr_t), sizeof(struct ether_header)); - ni = ieee80211_find_node(ic, eh.ether_dhost); - if (ni == NULL) /*ic_opmode?? XXX*/ - ni = ieee80211_ref_node(ic->ic_bss); + if (ic->ic_opmode != IEEE80211_M_STA) { + ni = ieee80211_find_node(ic, eh.ether_dhost); + if (ni == NULL) { + /* + * When not in station mode the + * destination address should always be + * in the node table unless this is a + * multicast/broadcast frame. + */ + if (!IEEE80211_IS_MULTICAST(eh.ether_dhost)) { + /* ic->ic_stats.st_tx_nonode++; XXX statistic */ + goto bad; + } + ni = ic->ic_bss; + } + } else + ni = ic->ic_bss; ni->ni_inact = 0; m_adj(m, sizeof(struct ether_header) - sizeof(struct llc)); @@ -142,10 +189,8 @@ llc->llc_snap.org_code[2] = 0; llc->llc_snap.ether_type = eh.ether_type; M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); - if (m == NULL) { - ieee80211_unref_node(&ni); - return NULL; - } + if (m == NULL) + goto bad; wh = mtod(m, struct ieee80211_frame *); wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA; *(u_int16_t *)wh->i_dur = 0; @@ -173,11 +218,17 @@ IEEE80211_ADDR_COPY(wh->i_addr3, eh.ether_shost); break; case IEEE80211_M_MONITOR: - m_freem(m), m = NULL; - break; + goto bad; } - ieee80211_unref_node(&ni); + *pni = ni; return m; +bad: + if (m != NULL) + m_freem(m); + if (ni && ni != ic->ic_bss) + ieee80211_free_node(ic, ni); + *pni = NULL; + return NULL; } /* @@ -240,10 +291,16 @@ return m; } +/* + * Send a management frame. The node is for the destination (or ic_bss + * when in station mode). Nodes other than ic_bss have their reference + * count bumped to reflect our use for an indeterminant time. + */ int ieee80211_send_mgmt(struct ieee80211com *ic, struct ieee80211_node *ni, int type, int arg) { +#define senderr(_x) do { ret = _x; goto bad; } while (0) struct ifnet *ifp = &ic->ic_if; struct mbuf *m; u_int8_t *frm; @@ -251,6 +308,15 @@ u_int16_t capinfo; int ret, timer; + KASSERT(ni != NULL, ("null node")); + + /* + * Hold a reference on the node so it doesn't go away until after + * the xmit is complete all the way in the driver. On error we + * will remove our reference. + */ + if (ni != ic->ic_bss) + ieee80211_ref_node(ni); timer = 0; switch (type) { case IEEE80211_FC0_SUBTYPE_PROBE_REQ: @@ -265,7 +331,7 @@ + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); m->m_data += sizeof(struct ieee80211_frame); frm = mtod(m, u_int8_t *); frm = ieee80211_add_ssid(frm, ic->ic_des_essid, ic->ic_des_esslen); @@ -295,7 +361,7 @@ + 6 + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); m->m_data += sizeof(struct ieee80211_frame); frm = mtod(m, u_int8_t *); @@ -336,7 +402,7 @@ case IEEE80211_FC0_SUBTYPE_AUTH: MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); MH_ALIGN(m, 2 * 3); m->m_pkthdr.len = m->m_len = 6; frm = mtod(m, u_int8_t *); @@ -354,7 +420,7 @@ ether_sprintf(ni->ni_macaddr), arg); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); MH_ALIGN(m, 2); m->m_pkthdr.len = m->m_len = 2; *mtod(m, u_int16_t *) = htole16(arg); /* reason */ @@ -379,7 +445,7 @@ + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); m->m_data += sizeof(struct ieee80211_frame); frm = mtod(m, u_int8_t *); @@ -430,7 +496,7 @@ + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE)); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); m->m_data += sizeof(struct ieee80211_frame); frm = mtod(m, u_int8_t *); @@ -443,19 +509,12 @@ *(u_int16_t *)frm = htole16(arg); /* status */ frm += 2; - if (arg == IEEE80211_STATUS_SUCCESS && ni != NULL) + if (arg == IEEE80211_STATUS_SUCCESS) *(u_int16_t *)frm = htole16(ni->ni_associd); - else - *(u_int16_t *)frm = htole16(0); frm += 2; - if (ni != NULL) { - frm = ieee80211_add_rates(frm, &ni->ni_rates); - frm = ieee80211_add_xrates(frm, &ni->ni_rates); - } else { - frm = ieee80211_add_rates(frm, &ic->ic_bss->ni_rates); - frm = ieee80211_add_xrates(frm, &ic->ic_bss->ni_rates); - } + frm = ieee80211_add_rates(frm, &ni->ni_rates); + frm = ieee80211_add_xrates(frm, &ni->ni_rates); m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); break; @@ -465,7 +524,7 @@ ether_sprintf(ni->ni_macaddr), arg); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) - return ENOMEM; + senderr(ENOMEM); MH_ALIGN(m, 2); m->m_pkthdr.len = m->m_len = 2; *mtod(m, u_int16_t *) = htole16(arg); /* reason */ @@ -474,11 +533,19 @@ default: IEEE80211_DPRINTF(("%s: invalid mgmt frame type %u\n", __func__, type)); - return EINVAL; + senderr(EINVAL); + /* NOTREACHED */ } ret = ieee80211_mgmt_output(ifp, ni, m, type); - if (ret == 0 && timer) - ic->ic_mgt_timer = timer; + if (ret == 0) { + if (timer) + ic->ic_mgt_timer = timer; + } else { +bad: + if (ni != ic->ic_bss) /* remove ref we added */ + ieee80211_free_node(ic, ni); + } return ret; +#undef senderr } ==== //depot/projects/netperf/sys/net80211/ieee80211_proto.c#2 (text+ko) ==== ==== //depot/projects/netperf/sys/net80211/ieee80211_proto.h#3 (text+ko) ==== @@ -62,9 +62,8 @@ struct ieee80211_node *, int, int, u_int32_t); extern int ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *, int, int); -extern int ieee80211_mgmt_output(struct ifnet *, struct ieee80211_node *, - struct mbuf *, int); -extern struct mbuf *ieee80211_encap(struct ifnet *, struct mbuf *); +extern struct mbuf *ieee80211_encap(struct ifnet *, struct mbuf *, + struct ieee80211_node **); extern struct mbuf *ieee80211_decap(struct ifnet *, struct mbuf *); extern u_int8_t *ieee80211_add_rates(u_int8_t *frm, const struct ieee80211_rateset *); From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:16:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3E9C37B401; Thu, 14 Aug 2003 09:16:11 -0700 (PDT) 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 71BD137B404 for ; Thu, 14 Aug 2003 09:16:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAA1543FCB for ; Thu, 14 Aug 2003 09:16:10 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGGA0U056771 for ; Thu, 14 Aug 2003 09:16:10 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGGADG056768 for perforce@freebsd.org; Thu, 14 Aug 2003 09:16:10 -0700 (PDT) Date: Thu, 14 Aug 2003 09:16:10 -0700 (PDT) Message-Id: <200308141616.h7EGGADG056768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36100 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, 14 Aug 2003 16:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=36100 Change 36100 by sam@sam_ebb on 2003/08/14 09:15:56 use ETHER_IS_MULTICAST instead of inline code Affected files ... .. //depot/projects/netperf/sys/net/if_ethersubr.c#2 edit Differences ... ==== //depot/projects/netperf/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -651,7 +651,7 @@ m_freem(m); return; } - if (eh->ether_dhost[0] & 1) { + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost, sizeof(etherbroadcastaddr)) == 0) m->m_flags |= M_BCAST; From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:25:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76D5637B401; Thu, 14 Aug 2003 09:25:24 -0700 (PDT) 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 107D137B404 for ; Thu, 14 Aug 2003 09:25:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B0B743FCB for ; Thu, 14 Aug 2003 09:25:22 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGPM0U057139 for ; Thu, 14 Aug 2003 09:25:22 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGPMT1057136 for perforce@freebsd.org; Thu, 14 Aug 2003 09:25:22 -0700 (PDT) Date: Thu, 14 Aug 2003 09:25:22 -0700 (PDT) Message-Id: <200308141625.h7EGPMT1057136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36101 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, 14 Aug 2003 16:25:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=36101 Change 36101 by sam@sam_ebb on 2003/08/14 09:24:56 Checkpoint bridge work while I search for the mbuf corruption. Bridge data structures are locked with a single lock that's used for both the cluster tables and to synchronize reconfiguration. This means only a single interface can be "in the bridge" at a time which is suboptimal (want to revisit this during performance tuning to see if sx locks are a win.) Bridge timeout handling is now done with an MPSAFE callout. Redo sysctl operations to minimize locking by copying in new parameters and checking if an update is needed before locking. This also eliminates holding the bridge lock over the sysctl-related work. Revamp syctls so all bridge mib entries are in net.link.ether.bridge; probably need to revert this for compatibility (stats left where they were so netstat works unchanged). Redo debugging support and make it so net.link.ether.bridge.debug controls messages when code is built with BRIDGE_DEBUG. Make timing support conditional on BRIDGE_TIMING. Use #defines instead of explicit constants; e.g. ETHER_ADDR_LEN. Introduce ETHER_ADDR_COPY and ETHER_ADDR_EQ for address operations. Redo frame forwarding to optimize common case of two interfaces and to optimize unicast forwarding. Be more consistent in use of macros like BDG_CLUSTER. Make style more consistent within file and closer to style(9). Affected files ... .. //depot/projects/netperf/sys/net/bridge.c#3 edit Differences ... ==== //depot/projects/netperf/sys/net/bridge.c#3 (text+ko) ==== @@ -116,6 +116,9 @@ /*--------------------*/ +#define ETHER_ADDR_COPY(_dst,_src) bcopy(_src, _dst, ETHER_ADDR_LEN) +#define ETHER_ADDR_EQ(_a1,_a2) (bcmp(_a1, _a2, ETHER_ADDR_LEN) == 0) + /* * For each cluster, source MAC addresses are stored into a hash * table which locates the port they reside on. @@ -124,7 +127,7 @@ typedef struct hash_table { /* each entry. */ struct ifnet * name; - u_char etheraddr[6]; + u_char etheraddr[ETHER_ADDR_LEN]; u_int16_t used; /* also, padding */ } bdg_hash_table ; @@ -140,8 +143,8 @@ * This is the data structure where local addresses are stored. */ struct bdg_addr { - u_char etheraddr[6] ; - u_int16_t _padding ; + u_char etheraddr[ETHER_ADDR_LEN]; + u_int16_t _padding; }; /* @@ -162,6 +165,11 @@ static int n_clusters; /* number of clusters */ static struct cluster_softc *clusters; +static struct mtx bdg_mtx; +#define BDG_LOCK() mtx_lock(&bdg_mtx); +#define BDG_UNLOCK() mtx_unlock(&bdg_mtx); +#define BDG_LOCK_ASSERT(_what) mtx_assert(&bdg_mtx, _what); + #define BDG_MUTED(ifp) (ifp2sc[ifp->if_index].flags & IFF_MUTE) #define BDG_MUTE(ifp) ifp2sc[ifp->if_index].flags |= IFF_MUTE #define BDG_CLUSTER(ifp) (ifp2sc[ifp->if_index].cluster) @@ -178,11 +186,25 @@ ((u_int16_t *)(a))[2] == 0xffff ) #else /* for machines that do not support unaligned access */ -#define BDG_MATCH(a,b) (!bcmp(a, b, ETHER_ADDR_LEN) ) -#define IS_ETHER_BROADCAST(a) (!bcmp(a, "\377\377\377\377\377\377", 6)) +#define BDG_MATCH(a,b) ETHER_ADDR_EQ(a,b) +#define IS_ETHER_BROADCAST(a) ETHER_ADDR_EQ(a,"\377\377\377\377\377\377") #endif +SYSCTL_DECL(_net_link_ether); +SYSCTL_NODE(_net_link_ether, OID_AUTO, bridge, CTLFLAG_RD, 0, + "Bridge parameters"); +#define BRIDGE_DEBUG +#ifdef BRIDGE_DEBUG +int bridge_debug = 0; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, debug, CTLFLAG_RW, &bridge_debug, + 0, "control debugging printfs"); +#define DPRINTF(X) if (bridge_debug) printf X +#else +#define DPRINTF(X) +#endif + +#ifdef BRIDGE_TIMING /* * For timing-related debugging, you can use the following macros. * remember, rdtsc() only works on Pentium-class machines @@ -194,17 +216,53 @@ * */ +#define DDB(x) x -#define DDB(x) x -#define DEB(x) +static int bdg_fw_avg; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, fw_avg, CTLFLAG_RW, + &bdg_fw_avg, 0,"Cycle counter avg"); +static int bdg_fw_ticks; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, fw_ticks, CTLFLAG_RW, + &bdg_fw_ticks, 0,"Cycle counter item"); +static int bdg_fw_count; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, fw_count, CTLFLAG_RW, + &bdg_fw_count, 0,"Cycle counter count"); +#else +#define DDB(x) +#endif static int bdginit(void); static void parse_bdg_cfg(void); static int bdg_ipf; /* IPFilter enabled in bridge */ +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, ipf, CTLFLAG_RW, + &bdg_ipf, 0,"Pass bridged pkts through IPFilter"); static int bdg_ipfw; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, ipfw, CTLFLAG_RW, + &bdg_ipfw,0,"Pass bridged pkts through firewall"); + +static int bdg_copy; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, copy, CTLFLAG_RW, + &bdg_copy, 0, "Force packet copy in bdg_forward"); -#if 0 /* debugging only */ +int bdg_ipfw_drops; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, ipfw_drop, + CTLFLAG_RW, &bdg_ipfw_drops,0,""); +int bdg_ipfw_colls; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, ipfw_collisions, + CTLFLAG_RW, &bdg_ipfw_colls,0,""); + +static int bdg_thru; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, packets, CTLFLAG_RW, + &bdg_thru, 0, "Packets through bridge"); +static int bdg_dropped; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, dropped, CTLFLAG_RW, + &bdg_dropped, 0, "Packets dropped in bdg_forward"); +static int bdg_predict; +SYSCTL_INT(_net_link_ether_bridge, OID_AUTO, predict, CTLFLAG_RW, + &bdg_predict, 0, "Correctly predicted header location"); + +#ifdef BRIDGE_DEBUG static char *bdg_dst_names[] = { "BDG_NULL ", "BDG_BCAST ", @@ -215,13 +273,17 @@ "BDG_IN ", "BDG_OUT ", "BDG_FORWARD " }; -#endif +#endif /* BRIDGE_DEBUG */ + /* * System initialization */ +static struct bdg_stats bdg_stats ; +/* NB: leave at net.link.ether so netstat continues to work */ +SYSCTL_STRUCT(_net_link_ether, PF_BDG, bdgstats, CTLFLAG_RD, + &bdg_stats, bdg_stats, "bridge statistics"); -static struct bdg_stats bdg_stats ; -static struct callout_handle bdg_timeout_h ; +static struct callout bdg_callout; /* * Add an interface to a cluster, possibly creating a new entry in @@ -234,6 +296,8 @@ struct cluster_softc *c = NULL; int i; + BDG_LOCK_ASSERT(MA_OWNED); + for (i = 0; i < n_clusters ; i++) if (clusters[i].cluster_id == cluster_id) goto found; @@ -242,15 +306,14 @@ c = malloc((1+n_clusters) * sizeof (*c), M_IFADDR, M_NOWAIT | M_ZERO); if (c == NULL) {/* malloc failure */ printf("-- bridge: cannot add new cluster\n"); - return NULL; + goto bad; } c[n_clusters].ht = (struct hash_table *) malloc(HASH_SIZE * sizeof(struct hash_table), M_IFADDR, M_NOWAIT | M_ZERO); if (c[n_clusters].ht == NULL) { printf("-- bridge: cannot allocate hash table for new cluster\n"); - free(c, M_IFADDR); - return NULL; + goto bad; } c[n_clusters].my_macs = (struct bdg_addr *) malloc(BDG_MAX_PORTS * sizeof(struct bdg_addr), @@ -258,8 +321,7 @@ if (c[n_clusters].my_macs == NULL) { printf("-- bridge: cannot allocate mac addr table for new cluster\n"); free(c[n_clusters].ht, M_IFADDR); - free(c, M_IFADDR); - return NULL; + goto bad; } c[n_clusters].cluster_id = cluster_id; @@ -283,9 +345,13 @@ n_clusters++; found: c = clusters + i; /* the right cluster ... */ - bcopy(ac->ac_enaddr, &(c->my_macs[c->ports]), 6); + ETHER_ADDR_COPY(c->my_macs[c->ports].etheraddr, ac->ac_enaddr); c->ports++; return c; +bad: + if (c) + free(c, M_IFADDR); + return NULL; } @@ -299,25 +365,26 @@ bridge_off(void) { struct ifnet *ifp ; - int i, s; + int i; + + BDG_LOCK_ASSERT(MA_OWNED); + + DPRINTF(("%s: n_clusters %d\n", __func__, n_clusters)); - DEB(printf("bridge_off: n_clusters %d\n", n_clusters);) IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { struct bdg_softc *b; if (ifp->if_index >= BDG_MAX_PORTS) continue; /* make sure we do not go beyond the end */ - b = &(ifp2sc[ifp->if_index]); + b = &ifp2sc[ifp->if_index]; if ( b->flags & IFF_BDG_PROMISC ) { - s = splimp(); ifpromisc(ifp, 0); - splx(s); b->flags &= ~(IFF_BDG_PROMISC|IFF_MUTE) ; - DEB(printf(">> now %s%d promisc OFF if_flags 0x%x bdg_flags 0x%x\n", - ifp->if_name, ifp->if_unit, - ifp->if_flags, b->flags);) + DPRINTF(("%s: %s%d promisc OFF if_flags 0x%x " + "bdg_flags 0x%x\n", __func__, ifp->if_name, ifp->if_unit, + ifp->if_flags, b->flags)); } b->flags &= ~(IFF_USED) ; b->cluster = NULL; @@ -326,7 +393,6 @@ IFNET_RUNLOCK(); /* flush_tables */ - s = splimp(); for (i=0; i < n_clusters; i++) { free(clusters[i].ht, M_IFADDR); free(clusters[i].my_macs, M_IFADDR); @@ -335,7 +401,6 @@ free(clusters, M_IFADDR); clusters = NULL; n_clusters =0; - splx(s); } /* @@ -345,7 +410,8 @@ bridge_on(void) { struct ifnet *ifp ; - int s ; + + BDG_LOCK_ASSERT(MA_OWNED); IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { @@ -354,28 +420,25 @@ if ( !(b->flags & IFF_USED) ) continue ; if ( !( ifp->if_flags & IFF_UP) ) { - s = splimp(); if_up(ifp); - splx(s); } if ( !(b->flags & IFF_BDG_PROMISC) ) { - int ret ; - s = splimp(); - ret = ifpromisc(ifp, 1); - splx(s); + (void) ifpromisc(ifp, 1); b->flags |= IFF_BDG_PROMISC ; - DEB(printf(">> now %s%d promisc ON if_flags 0x%x bdg_flags 0x%x\n", - ifp->if_name, ifp->if_unit, - ifp->if_flags, b->flags);) + DPRINTF(("%s: %s%d promisc ON if_flags 0x%x bdg_flags 0x%x\n", + __func__, ifp->if_name, ifp->if_unit, ifp->if_flags, b->flags)); } if (b->flags & IFF_MUTE) { - DEB(printf(">> unmuting %s%d\n", ifp->if_name, ifp->if_unit);) + DPRINTF(("%s: unmuting %s%d\n", __func__, + ifp->if_name, ifp->if_unit)); b->flags &= ~IFF_MUTE; } } IFNET_RUNLOCK(); } +static char bridge_cfg[1024]; /* NB: in BSS so initialized to zero */ + /** * reconfigure bridge. * This is also done every time we attach or detach an interface. @@ -385,14 +448,16 @@ * have to scan all interfaces. */ static void -reconfigure_bridge(void) +reconfigure_bridge_locked(void) { + BDG_LOCK_ASSERT(MA_OWNED); + bridge_off(); if (do_bridge) { if (if_index >= BDG_MAX_PORTS) { printf("-- sorry too many interfaces (%d, max is %d)," " disabling bridging\n", if_index, BDG_MAX_PORTS); - do_bridge=0; + do_bridge = 0; return; } parse_bdg_cfg(); @@ -400,7 +465,13 @@ } } -static char bridge_cfg[1024]; /* in BSS so initialized to all NULs */ +static void +reconfigure_bridge(void) +{ + BDG_LOCK(); + reconfigure_bridge_locked(); + BDG_UNLOCK(); +} /* * parse the config string, set IFF_USED, name and cluster_id @@ -411,11 +482,13 @@ * "ifconfig -l" */ static void -parse_bdg_cfg() +parse_bdg_cfg(void) { - char *p, *beg ; + char *p, *beg; int l, cluster; - static char *sep = ", \t"; + static const char *sep = ", \t"; + + BDG_LOCK_ASSERT(MA_OWNED); for (p = bridge_cfg; *p ; p++) { struct ifnet *ifp; @@ -459,8 +532,8 @@ sprintf(bdg_stats.s[ifp->if_index].name, "%s%d:%d", ifp->if_name, ifp->if_unit, cluster); - DEB(printf("--++ found %s next c %d\n", - bdg_stats.s[ifp->if_index].name, c);) + DPRINTF(("%s: found %s next c %d\n", __func__, + bdg_stats.s[ifp->if_index].name, c)); found = 1; break ; } @@ -474,24 +547,26 @@ } } - /* * handler for net.link.ether.bridge */ static int sysctl_bdg(SYSCTL_HANDLER_ARGS) { - int error, oldval = do_bridge ; + int enable = do_bridge; + int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); - DEB( printf("called sysctl for bridge name %s arg2 %d val %d->%d\n", - oidp->oid_name, oidp->oid_arg2, - oldval, do_bridge); ) - - if (oldval != do_bridge) - reconfigure_bridge(); + error = sysctl_handle_int(oidp, &enable, 0, req); + BDG_LOCK(); + if (enable != do_bridge) { + do_bridge = enable; + reconfigure_bridge_locked(); + } + BDG_UNLOCK(); return error ; } +SYSCTL_PROC(_net_link_ether_bridge, OID_AUTO, enable, CTLTYPE_INT|CTLFLAG_RW, + &do_bridge, 0, &sysctl_bdg, "I", "Bridging"); /* * handler for net.link.ether.bridge_cfg @@ -499,22 +574,29 @@ static int sysctl_bdg_cfg(SYSCTL_HANDLER_ARGS) { - int error = 0 ; - char old_cfg[1024] ; + int error; + char *new_cfg; + + new_cfg = malloc(sizeof(bridge_cfg), M_TEMP, M_WAITOK); + bcopy(bridge_cfg, new_cfg, sizeof(bridge_cfg)); + + error = sysctl_handle_string(oidp, new_cfg, oidp->oid_arg2, req); + if (error == 0) { + BDG_LOCK(); + if (strcmp(new_cfg, bridge_cfg)) { + bcopy(new_cfg, bridge_cfg, sizeof(bridge_cfg)); + reconfigure_bridge_locked(); + } + BDG_UNLOCK(); + } - strcpy(old_cfg, bridge_cfg) ; + free(new_cfg, M_TEMP); - error = sysctl_handle_string(oidp, bridge_cfg, oidp->oid_arg2, req); - DEB( - printf("called sysctl for bridge name %s arg2 %d err %d val %s->%s\n", - oidp->oid_name, oidp->oid_arg2, - error, - old_cfg, bridge_cfg); - ) - if (strcmp(old_cfg, bridge_cfg)) - reconfigure_bridge(); - return error ; + return error; } +SYSCTL_PROC(_net_link_ether_bridge, OID_AUTO, config, CTLTYPE_STRING|CTLFLAG_RW, + &bridge_cfg, sizeof(bridge_cfg), &sysctl_bdg_cfg, "A", + "Bridge configuration"); static int sysctl_refresh(SYSCTL_HANDLER_ARGS) @@ -524,103 +606,53 @@ return 0; } - - -SYSCTL_DECL(_net_link_ether); -SYSCTL_PROC(_net_link_ether, OID_AUTO, bridge_cfg, CTLTYPE_STRING|CTLFLAG_RW, - &bridge_cfg, sizeof(bridge_cfg), &sysctl_bdg_cfg, "A", - "Bridge configuration"); - -SYSCTL_PROC(_net_link_ether, OID_AUTO, bridge, CTLTYPE_INT|CTLFLAG_RW, - &do_bridge, 0, &sysctl_bdg, "I", "Bridging"); - -SYSCTL_INT(_net_link_ether, OID_AUTO, bridge_ipfw, CTLFLAG_RW, - &bdg_ipfw,0,"Pass bridged pkts through firewall"); - -SYSCTL_INT(_net_link_ether, OID_AUTO, bridge_ipf, CTLFLAG_RW, - &bdg_ipf, 0,"Pass bridged pkts through IPFilter"); - -/* - * The follow macro declares a variable, and maps it to - * a SYSCTL_INT entry with the same name. - */ -#define SY(parent, var, comment) \ - static int var ; \ - SYSCTL_INT(parent, OID_AUTO, var, CTLFLAG_RW, &(var), 0, comment); - -int bdg_ipfw_drops; -SYSCTL_INT(_net_link_ether, OID_AUTO, bridge_ipfw_drop, - CTLFLAG_RW, &bdg_ipfw_drops,0,""); - -int bdg_ipfw_colls; -SYSCTL_INT(_net_link_ether, OID_AUTO, bridge_ipfw_collisions, - CTLFLAG_RW, &bdg_ipfw_colls,0,""); - -SYSCTL_PROC(_net_link_ether, OID_AUTO, bridge_refresh, CTLTYPE_INT|CTLFLAG_WR, +SYSCTL_PROC(_net_link_ether_bridge, OID_AUTO, refresh, CTLTYPE_INT|CTLFLAG_WR, NULL, 0, &sysctl_refresh, "I", "iface refresh"); -#if 1 /* diagnostic vars */ - -SY(_net_link_ether, verbose, "Be verbose"); -SY(_net_link_ether, bdg_split_pkts, "Packets split in bdg_forward"); - -SY(_net_link_ether, bdg_thru, "Packets through bridge"); - -SY(_net_link_ether, bdg_copied, "Packets copied in bdg_forward"); -SY(_net_link_ether, bdg_dropped, "Packets dropped in bdg_forward"); - -SY(_net_link_ether, bdg_copy, "Force copy in bdg_forward"); -SY(_net_link_ether, bdg_predict, "Correctly predicted header location"); - -SY(_net_link_ether, bdg_fw_avg, "Cycle counter avg"); -SY(_net_link_ether, bdg_fw_ticks, "Cycle counter item"); -SY(_net_link_ether, bdg_fw_count, "Cycle counter count"); -#endif - -SYSCTL_STRUCT(_net_link_ether, PF_BDG, bdgstats, - CTLFLAG_RD, &bdg_stats , bdg_stats, "bridge statistics"); +static int bdg_loops; +static int bdg_slowtimer = 0; +static int bdg_age_index = 0; /* index of table position to age */ -static int bdg_loops ; - /* * called periodically to flush entries etc. */ static void bdg_timeout(void *dummy) { - static int slowtimer; /* in BSS so initialized to 0 */ + if (do_bridge) { + int l, i; - if (do_bridge) { - static int age_index = 0 ; /* index of table position to age */ - int l = age_index + HASH_SIZE/4 ; - int i; + BDG_LOCK(); /* * age entries in the forwarding table. */ + l = bdg_age_index + HASH_SIZE/4 ; if (l > HASH_SIZE) - l = HASH_SIZE ; + l = HASH_SIZE; - for (i=0; i= HASH_SIZE) - age_index = 0 ; + if (bdg_age_index >= HASH_SIZE) + bdg_age_index = 0; - if (--slowtimer <= 0 ) { - slowtimer = 5 ; + if (--bdg_slowtimer <= 0 ) { + bdg_slowtimer = 5; - bridge_on() ; /* we just need unmute, really */ - bdg_loops = 0 ; + bridge_on(); /* we just need unmute, really */ + bdg_loops = 0; } + BDG_UNLOCK(); } - bdg_timeout_h = timeout(bdg_timeout, NULL, 2*hz ); + callout_reset(&bdg_callout, 2*hz, bdg_timeout, NULL); } /* @@ -634,35 +666,42 @@ * We assume this is only called for interfaces for which bridging * is enabled, i.e. BDG_USED(ifp) is true. */ -static __inline -struct ifnet * +static __inline struct ifnet * bridge_dst_lookup(struct ether_header *eh, struct cluster_softc *c) { - struct ifnet *dst ; - int index ; - struct bdg_addr *p ; bdg_hash_table *bt; /* pointer to entry in hash table */ - if (IS_ETHER_BROADCAST(eh->ether_dhost)) - return BDG_BCAST ; - if (eh->ether_dhost[0] & 1) - return BDG_MCAST ; + BDG_LOCK_ASSERT(MA_OWNED); + + if (ETHER_IS_MULTICAST(eh->ether_dhost)) + return IS_ETHER_BROADCAST(eh->ether_dhost) ? BDG_BCAST : BDG_MCAST; /* - * Lookup local addresses in case one matches. + * Lookup local addresses in case one matches. We optimize + * for the common case of two interfaces. */ - for (index = c->ports, p = c->my_macs; index ; index--, p++ ) - if (BDG_MATCH(p->etheraddr, eh->ether_dhost) ) - return BDG_LOCAL ; + switch (c->ports) { + int i; + default: + for (i = c->ports-1; i > 1; i--) { + if (ETHER_ADDR_EQ(c->my_macs[i].etheraddr, eh->ether_dhost)) + return BDG_LOCAL; + } + /* fall thru... */ + case 2: + if (ETHER_ADDR_EQ(c->my_macs[1].etheraddr, eh->ether_dhost)) + return BDG_LOCAL; + case 1: + if (ETHER_ADDR_EQ(c->my_macs[0].etheraddr, eh->ether_dhost)) + return BDG_LOCAL; + } /* * Look for a possible destination in table */ - index= HASH_FN( eh->ether_dhost ); - bt = &(c->ht[index]); - dst = bt->name; - if ( dst && BDG_MATCH( bt->etheraddr, eh->ether_dhost) ) - return dst ; + bt = &c->ht[HASH_FN(eh->ether_dhost)]; + if (bt->name && ETHER_ADDR_EQ(bt->etheraddr, eh->ether_dhost)) + return bt->name; else - return BDG_UNKNOWN ; + return BDG_UNKNOWN; } /** @@ -687,21 +726,22 @@ bridge_in(struct ifnet *ifp, struct ether_header *eh) { int index; - struct ifnet *dst , *old ; + struct ifnet *dst, *old; bdg_hash_table *bt; /* location in hash table */ - int dropit = BDG_MUTED(ifp) ; + int dropit = BDG_MUTED(ifp); /* * hash the source address */ - index= HASH_FN(eh->ether_shost); - bt = &(ifp2sc[ifp->if_index].cluster->ht[index]); - bt->used = 1 ; - old = bt->name ; - if ( old ) { /* the entry is valid. */ - if (!BDG_MATCH( eh->ether_shost, bt->etheraddr) ) { - bdg_ipfw_colls++ ; - bt->name = NULL ; + BDG_LOCK(); + index = HASH_FN(eh->ether_shost); + bt = &BDG_CLUSTER(ifp)->ht[index]; + bt->used = 1; + old = bt->name; + if (old) { /* the entry is valid */ + if (!ETHER_ADDR_EQ(eh->ether_shost, bt->etheraddr)) { + bdg_ipfw_colls++; + bt->name = NULL; /* NB: will overwrite below */ } else if (old != ifp) { /* * Found a loop. Either a machine has moved, or there @@ -711,16 +751,16 @@ * suspect a reconfiguration and disable forwarding * from the old interface. */ - bt->name = ifp ; /* relocate address */ + bt->name = ifp; /* relocate address */ printf("-- loop (%d) %6D to %s%d from %s%d (%s)\n", bdg_loops, eh->ether_shost, ".", ifp->if_name, ifp->if_unit, old->if_name, old->if_unit, BDG_MUTED(old) ? "muted":"active"); - dropit = 1 ; - if ( !BDG_MUTED(old) ) { - if (++bdg_loops > 10) - BDG_MUTE(old) ; + dropit = 1; + if (!BDG_MUTED(old)) { + if (bdg_loops++ > 10) + BDG_MUTE(old); } } } @@ -729,12 +769,14 @@ * now write the source address into the table */ if (bt->name == NULL) { - DEB(printf("new addr %6D at %d for %s%d\n", - eh->ether_shost, ".", index, ifp->if_name, ifp->if_unit);) - bcopy(eh->ether_shost, bt->etheraddr, 6); - bt->name = ifp ; + DPRINTF(("%s: new addr %6D at %d for %s%d\n", + __func__, eh->ether_shost, ".", index, ifp->if_name, ifp->if_unit)); + ETHER_ADDR_COPY(bt->etheraddr, eh->ether_shost); + bt->name = ifp; } - dst = bridge_dst_lookup(eh, ifp2sc[ifp->if_index].cluster); + dst = bridge_dst_lookup(eh, BDG_CLUSTER(ifp)); + BDG_UNLOCK(); + /* * bridge_dst_lookup can return the following values: * BDG_BCAST, BDG_MCAST, BDG_LOCAL, BDG_UNKNOWN, BDG_DROP, ifp. @@ -752,33 +794,54 @@ case (uintptr_t)BDG_UNKNOWN: case (uintptr_t)BDG_DROP: BDG_STAT(ifp, dst); - break ; - default : + break; + default: if (dst == ifp || dropit) BDG_STAT(ifp, BDG_DROP); else BDG_STAT(ifp, BDG_FORWARD); - break ; + break; } - if ( dropit ) { + if (dropit) { if (dst == BDG_BCAST || dst == BDG_MCAST || dst == BDG_LOCAL) - dst = BDG_LOCAL ; + dst = BDG_LOCAL; else - dst = BDG_DROP ; + dst = BDG_DROP; } else { if (dst == ifp) dst = BDG_DROP; } - DEB(printf("bridge_in %6D ->%6D ty 0x%04x dst %s%d\n", + DPRINTF(("%s: %6D ->%6D ty 0x%04x dst %s%d\n", __func__, eh->ether_shost, ".", eh->ether_dhost, ".", ntohs(eh->ether_type), (dst <= BDG_FORWARD) ? bdg_dst_names[(int)dst] : dst->if_name, - (dst <= BDG_FORWARD) ? 0 : dst->if_unit); ) + (dst <= BDG_FORWARD) ? 0 : dst->if_unit)); + + return dst; +} - return dst ; +/* + * Return 1 if it's ok to send a packet out the specified interface. + * The interface must be: + * used for bridging, + * not muted, + * not full, + * up and running, + * not the source interface, and + * belong to the same cluster as the 'real_dst'. + */ +static __inline int +bridge_ifok(struct ifnet *ifp, struct ifnet *src, struct ifnet *dst) +{ + return (BDG_USED(ifp) + && !BDG_MUTED(ifp) + && !_IF_QFULL(&ifp->if_snd) + && (ifp->if_flags & (IFF_UP|IFF_RUNNING)) == (IFF_UP|IFF_RUNNING) + && ifp != src + && BDG_SAMECLUSTER(ifp, dst)); } /* @@ -812,27 +875,27 @@ struct ether_header *eh; struct ifnet *src; struct ifnet *ifp, *last; - int shared = bdg_copy ; /* someone else is using the mbuf */ - int once = 0; /* loop only once */ - struct ifnet *real_dst = dst ; /* real dst from ether_output */ + int shared = bdg_copy; /* someone else is using the mbuf */ + struct ifnet *real_dst = dst; /* real dst from ether_output */ struct ip_fw_args args; #ifdef PFIL_HOOKS struct packet_filter_hook *pfh; int rv; #endif /* PFIL_HOOKS */ struct ether_header save_eh; + struct mbuf *m; - DEB(quad_t ticks; ticks = rdtsc();) + DDB(quad_t ticks; ticks = rdtsc();) args.rule = NULL; /* did we match a firewall rule ? */ /* Fetch state from dummynet tag, ignore others */ for (;m0->m_type == MT_TAG; m0 = m0->m_next) if (m0->_m_tag_id == PACKET_TAG_DUMMYNET) { args.rule = ((struct dn_pkt *)m0)->rule; - shared = 0; /* For sure this is our own mbuf. */ + shared = 0; /* For sure this is our own mbuf. */ } if (args.rule == NULL) - bdg_thru++; /* first time through bdg_forward, count packet */ + bdg_thru++; /* count 1st time through bdg_forward */ /* * The packet arrives with the Ethernet header at the front. @@ -840,22 +903,25 @@ eh = mtod(m0, struct ether_header *); src = m0->m_pkthdr.rcvif; - if (src == NULL) /* packet from ether_output */ - dst = bridge_dst_lookup(eh, ifp2sc[real_dst->if_index].cluster); + if (src == NULL) { /* packet from ether_output */ + BDG_LOCK(); + dst = bridge_dst_lookup(eh, BDG_CLUSTER(real_dst)); + BDG_UNLOCK(); + } - if (dst == BDG_DROP) { /* this should not happen */ + if (dst == BDG_DROP) { /* this should not happen */ printf("xx bdg_forward for BDG_DROP\n"); m_freem(m0); bdg_dropped++; return NULL; } - if (dst == BDG_LOCAL) { /* this should not happen as well */ + if (dst == BDG_LOCAL) { /* this should not happen as well */ printf("xx ouch, bdg_forward for local pkt\n"); return m0; } if (dst == BDG_BCAST || dst == BDG_MCAST) { /* need a copy for the local stack */ - shared = 1 ; + shared = 1; } /* @@ -880,12 +946,12 @@ * the packet (shared==1) also better be in the first mbuf. */ i = min(m0->m_pkthdr.len, max_protohdr) ; - if ( shared || m0->m_len < i) { - m0 = m_pullup(m0, i) ; + if (shared || m0->m_len < i) { + m0 = m_pullup(m0, i); if (m0 == NULL) { - printf("-- bdg: pullup failed.\n") ; + printf("%s: m_pullup failed\n", __func__); /* XXXDPRINTF*/ bdg_dropped++; - return NULL ; + return NULL; } eh = mtod(m0, struct ether_header *); } @@ -964,17 +1030,15 @@ EH_RESTORE(m0); /* restore Ethernet header */ if ( (i & IP_FW_PORT_DENY_FLAG) || m0 == NULL) /* drop */ - return m0 ; + return m0; if (i == 0) /* a PASS rule. */ - goto forward ; + goto forward; if (DUMMYNET_LOADED && (i & IP_FW_PORT_DYNT_FLAG)) { /* * Pass the pkt to dummynet, which consumes it. * If shared, make a copy and keep the original. */ - struct mbuf *m ; - if (shared) { m = m_copypacket(m0, M_DONTWAIT); if (m == NULL) { /* copy failed, give up */ @@ -988,27 +1052,27 @@ args.oif = real_dst; ip_dn_io_ptr(m, (i & 0xffff),DN_TO_BDG_FWD, &args); - return m0 ; + return m0; } /* * XXX at some point, add support for divert/forward actions. * If none of the above matches, we have to drop the packet. */ - bdg_ipfw_drops++ ; - return m0 ; + bdg_ipfw_drops++; + return m0; } forward: /* * Again, bring up the headers in case of shared bufs to avoid * corruptions in the future. */ - if ( shared ) { - int i = min(m0->m_pkthdr.len, max_protohdr) ; + if (shared) { + int i = min(m0->m_pkthdr.len, max_protohdr); - m0 = m_pullup(m0, i) ; + m0 = m_pullup(m0, i); if (m0 == NULL) { - bdg_dropped++ ; - return NULL ; + bdg_dropped++; + return NULL; } /* NB: eh is not used below; no need to recalculate it */ } @@ -1021,64 +1085,62 @@ * was already saved into real_dst. */ if (src != NULL) - real_dst = src ; + real_dst = src; last = NULL; - IFNET_RLOCK(); if (dst == BDG_BCAST || dst == BDG_MCAST || dst == BDG_UNKNOWN) { - ifp = TAILQ_FIRST(&ifnet) ; /* scan all ports */ - once = 0 ; + /* + * Scan all ports and send copies to all but the last. + */ + IFNET_RLOCK(); /* XXX replace with generation # */ + TAILQ_FOREACH(ifp, &ifnet, if_link) { + if (bridge_ifok(ifp, src, real_dst)) { + if (last) { + /* + * At this point we know two interfaces need a copy + * of the packet (last + ifp) so we must create a + * copy to handoff to last. + */ + m = m_copypacket(m0, M_DONTWAIT); + if (m == NULL) { + IFNET_RUNLOCK(); + printf("%s: , m_copypacket failed!\n", __func__); + bdg_dropped++; + return m0; /* the original is still there... */ + } + if (IF_HANDOFF(&last->if_snd, m, last)) + BDG_STAT(last, BDG_OUT); + else + bdg_dropped++; + } + last = ifp; + } + } + IFNET_RUNLOCK(); } else { - ifp = dst ; - once = 1 ; + if (bridge_ifok(dst, src, real_dst)) + last = dst; } - if ((uintptr_t)(ifp) <= (u_int)BDG_FORWARD) - panic("bdg_forward: bad dst"); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:51:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FDE037B404; Thu, 14 Aug 2003 09:51:59 -0700 (PDT) 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 9519637B401 for ; Thu, 14 Aug 2003 09:51:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA02843FBF for ; Thu, 14 Aug 2003 09:51:57 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGpv0U058218 for ; Thu, 14 Aug 2003 09:51:57 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGpvgV058215 for perforce@freebsd.org; Thu, 14 Aug 2003 09:51:57 -0700 (PDT) Date: Thu, 14 Aug 2003 09:51:57 -0700 (PDT) Message-Id: <200308141651.h7EGpvgV058215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 36105 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, 14 Aug 2003 16:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=36105 Change 36105 by cvance@cvance_osx_laptop on 2003/08/14 09:51:47 Undo previous submission Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.dist#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_file.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_geterr.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getfiles.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getprocs.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_hp300.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_luna68k.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_mips.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_next.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_nlist.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_open.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_private.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_proc.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_read.3#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_sparc.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile.include#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/adv_cmds.rtf#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/extern.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/finger.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/lprint.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/net.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/sprint.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/finger.tproj/util.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/fingerd.8#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/fingerd.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/fingerd.tproj/pathnames.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/last.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/last.tproj/last.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile.dist#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/md.tproj/md.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Japanese#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/POSIX#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/ldef.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/lex.l#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/mklocale.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/README.locale_name#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/bg_BG.CP1251.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ja_JP.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ja_JP.SJIS.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ko_KR.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-1.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-15.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-2.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-4.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/la_LN.US-ASCII.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.CP866.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/ru_RU.KOI8-R.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/uk_UA.KOI8-U.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/zh_CN.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/share/zh_TW.Big5.src#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/mklocale.tproj/yacc.y#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/extern.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/fmt.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/h.template#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/keyword.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/m.template#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/nlist.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/print.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/ps.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/ps.tproj/tasks.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/pstat.8#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/pstat.tproj/pstat.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile.dist#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/cchar.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/extern.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/gfmt.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/key.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/modes.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/print.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/stty.h#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/stty.tproj/util.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/tty.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/tty.tproj/tty.c#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/whois.1#2 delete .. //depot/projects/trustedbsd/sedarwin/apsl/adv_cmds/whois.tproj/whois.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 14 09:54:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D37E37B404; Thu, 14 Aug 2003 09:54:02 -0700 (PDT) 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 0DD9A37B401 for ; Thu, 14 Aug 2003 09:54:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6167A43FE1 for ; Thu, 14 Aug 2003 09:54:01 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EGs10U058750 for ; Thu, 14 Aug 2003 09:54:01 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EGs09h058743 for perforce@freebsd.org; Thu, 14 Aug 2003 09:54:00 -0700 (PDT) Date: Thu, 14 Aug 2003 09:54:00 -0700 (PDT) Message-Id: <200308141654.h7EGs09h058743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 36106 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, 14 Aug 2003 16:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=36106 Change 36106 by cvance@cvance_osx_laptop on 2003/08/14 09:53:45 Integ from Vendor branch Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.dist#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.postamble#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/Makefile.preamble#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/PB.project#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_file.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_geterr.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getfiles.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getloadavg.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_getprocs.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_hp300.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_luna68k.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_mips.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_next.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_nlist.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_open.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_private.h#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_proc.c#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_read.3#3 branch .. //depot/projects/trustedbsd/sedarwin/apsl/Libkvm/kvm_sparc.c#3 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/Makefile.include#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/adv_cmds.rtf#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/cap_mkdb.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/cap_mkdb.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/cap_mkdb.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/finger.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/finger.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/finger.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/lprint.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/net.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/sprint.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/finger.tproj/util.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/fingerd.8#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/fingerd.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/fingerd.tproj/pathnames.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/last.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/last.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/last.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/last.tproj/last.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/last.tproj/last.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/md.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/md.tproj/Makefile.dist#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/md.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/md.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/md.tproj/md.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/Japanese#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/POSIX#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/ldef.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/lex.l#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/mklocale.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/README.locale_name#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ja_JP.EUC.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ja_JP.SJIS.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ko_KR.EUC.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-4.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/la_LN.US-ASCII.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/zh_CN.EUC.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/share/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/mklocale.tproj/yacc.y#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/fmt.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/h.template#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/keyword.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/m.template#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/nlist.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/print.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/ps.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/ps.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/ps.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/tasks.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/pstat.8#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/pstat.tproj/pstat.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/Makefile.dist#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/cchar.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/gfmt.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/key.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/modes.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/print.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/stty.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/stty.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/stty.h#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/stty.tproj/util.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/tty.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/tty.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/tty.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/tty.tproj/tty.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/tty.tproj/tty.c#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/whois.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/whois.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/whois.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/whois.tproj/whois.1#1 branch .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/whois.tproj/whois.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:38:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE32137B404; Thu, 14 Aug 2003 12:38:37 -0700 (PDT) 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 9E94137B401 for ; Thu, 14 Aug 2003 12:38:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F57443F85 for ; Thu, 14 Aug 2003 12:38:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EJcb0U069919 for ; Thu, 14 Aug 2003 12:38:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EJcaFM069916 for perforce@freebsd.org; Thu, 14 Aug 2003 12:38:36 -0700 (PDT) Date: Thu, 14 Aug 2003 12:38:36 -0700 (PDT) Message-Id: <200308141938.h7EJcaFM069916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36128 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, 14 Aug 2003 19:38:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=36128 Change 36128 by sam@sam_ebb on 2003/08/14 12:38:23 moved saved_nrt to be local to the code that uses it and initialize it to zero rather than depending on rtrequest to DTRT Affected files ... .. //depot/projects/netperf/sys/net/rtsock.c#3 edit Differences ... ==== //depot/projects/netperf/sys/net/rtsock.c#3 (text+ko) ==== @@ -273,7 +273,6 @@ { register struct rt_msghdr *rtm = 0; register struct rtentry *rt = 0; - struct rtentry *saved_nrt = 0; struct radix_node_head *rnh; struct rt_addrinfo info; int len, error = 0; @@ -331,10 +330,12 @@ senderr(error); switch (rtm->rtm_type) { + struct rtentry *saved_nrt; case RTM_ADD: if (gate == 0) senderr(EINVAL); + saved_nrt = 0; error = rtrequest1(RTM_ADD, &info, &saved_nrt); if (error == 0 && saved_nrt) { RT_LOCK(saved_nrt); @@ -350,6 +351,7 @@ break; case RTM_DELETE: + saved_nrt = 0; error = rtrequest1(RTM_DELETE, &info, &saved_nrt); if (error == 0) { RT_LOCK(saved_nrt); From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:42:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D5A737B404; Thu, 14 Aug 2003 12:42:44 -0700 (PDT) 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 D21D537B401 for ; Thu, 14 Aug 2003 12:42:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7894B43FAF for ; Thu, 14 Aug 2003 12:42:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EJgh0U070146 for ; Thu, 14 Aug 2003 12:42:43 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EJghp2070143 for perforce@freebsd.org; Thu, 14 Aug 2003 12:42:43 -0700 (PDT) Date: Thu, 14 Aug 2003 12:42:43 -0700 (PDT) Message-Id: <200308141942.h7EJghp2070143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36130 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, 14 Aug 2003 19:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=36130 Change 36130 by sam@sam_ebb on 2003/08/14 12:42:20 reorder code in sis_start to defer work until we know we need it Affected files ... .. //depot/projects/netperf/sys/pci/if_sis.c#4 edit Differences ... ==== //depot/projects/netperf/sys/pci/if_sis.c#4 (text+ko) ==== @@ -1967,7 +1967,6 @@ struct ifnet *ifp; { struct sis_softc *sc; - struct mbuf *m_head = NULL; u_int32_t idx; sc = ifp->if_softc; @@ -1977,15 +1976,15 @@ SIS_UNLOCK(sc); return; } - - idx = sc->sis_cdata.sis_tx_prod; - if (ifp->if_flags & IFF_OACTIVE) { SIS_UNLOCK(sc); return; } + idx = sc->sis_cdata.sis_tx_prod; while(sc->sis_ldata.sis_tx_list[idx].sis_mbuf == NULL) { + struct mbuf *m_head; + IF_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:44:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B401637B404; Thu, 14 Aug 2003 12:44:49 -0700 (PDT) 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 6141037B401 for ; Thu, 14 Aug 2003 12:44:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3516F43FAF for ; Thu, 14 Aug 2003 12:44:48 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EJim0U070261 for ; Thu, 14 Aug 2003 12:44:48 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EJik5F070257 for perforce@freebsd.org; Thu, 14 Aug 2003 12:44:46 -0700 (PDT) Date: Thu, 14 Aug 2003 12:44:46 -0700 (PDT) Message-Id: <200308141944.h7EJik5F070257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36132 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, 14 Aug 2003 19:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=36132 Change 36132 by sam@sam_ebb on 2003/08/14 12:44:29 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/netperf/sys/conf/NOTES#4 integrate .. //depot/projects/netperf/sys/conf/files#2 integrate .. //depot/projects/netperf/sys/conf/kern.post.mk#2 integrate .. //depot/projects/netperf/sys/conf/options#4 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllength.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslload.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllookup.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslmain.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslmap.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslopcodes.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asloperands.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslopt.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslresource.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslrestype1.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslrestype2.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslstubs.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltransform.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltree.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltypes.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslutils.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/osunixxf.c#1 branch .. //depot/projects/netperf/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/netperf/sys/dev/amd/amd.c#3 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/netperf/sys/dev/ct/ct.c#2 integrate .. //depot/projects/netperf/sys/dev/dgb/dgreg.h#2 integrate .. //depot/projects/netperf/sys/dev/digi/digi.c#2 integrate .. //depot/projects/netperf/sys/dev/digi/digi.h#3 integrate .. //depot/projects/netperf/sys/dev/digi/digireg.h#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/netperf/sys/dev/fatm/if_fatmvar.h#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#4 integrate .. //depot/projects/netperf/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/netperf/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/netperf/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/netperf/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/netperf/sys/dev/md/md.c#4 integrate .. //depot/projects/netperf/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/netperf/sys/dev/mly/mly.c#2 integrate .. //depot/projects/netperf/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/netperf/sys/dev/patm/if_patm_ioctl.c#4 integrate .. //depot/projects/netperf/sys/dev/patm/if_patmvar.h#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/netperf/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/netperf/sys/dev/rc/rc.c#2 integrate .. //depot/projects/netperf/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/netperf/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/netperf/sys/dev/trm/trm.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#3 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pci.c#4 integrate .. //depot/projects/netperf/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/netperf/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/netperf/sys/i386/isa/spigot.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/netperf/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/netperf/sys/ia64/include/ieeefp.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/ucontext.h#3 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#3 integrate .. //depot/projects/netperf/sys/kern/link_elf.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_param.c#2 integrate .. //depot/projects/netperf/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/netperf/sys/kern/sys_process.c#3 integrate .. //depot/projects/netperf/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/netperf/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/netperf/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/netperf/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/netperf/sys/libkern/random.c#2 integrate .. //depot/projects/netperf/sys/modules/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/netgraph/atm/atmpif/Makefile#1 branch .. //depot/projects/netperf/sys/net/if_loop.c#3 integrate .. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif.c#1 branch .. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch .. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch .. //depot/projects/netperf/sys/netgraph/atm/ng_atmpif.h#1 branch .. //depot/projects/netperf/sys/netinet/in.h#2 integrate .. //depot/projects/netperf/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/netperf/sys/netinet/in_proto.c#2 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#2 integrate .. //depot/projects/netperf/sys/netinet/ip_var.h#2 integrate .. //depot/projects/netperf/sys/netinet/pim.h#1 branch .. //depot/projects/netperf/sys/netinet/pim_var.h#1 branch .. //depot/projects/netperf/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/netperf/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#3 integrate .. //depot/projects/netperf/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/netperf/sys/pci/meteor.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/netperf/sys/sys/mman.h#2 integrate .. //depot/projects/netperf/sys/sys/namei.h#2 integrate .. //depot/projects/netperf/sys/sys/pipe.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/netperf/sys/vm/uma_core.c#5 integrate .. //depot/projects/netperf/sys/vm/uma_int.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_contig.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_glue.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_init.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_kern.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_map.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_unix.c#2 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $"); #include #include @@ -1552,10 +1552,11 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; - + vm_page_unlock_queues(); splx(s); } ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $"); #include "opt_kstack_pages.h" @@ -248,8 +248,6 @@ void cpu_thread_exit(struct thread *td) { - - return; } void @@ -318,8 +316,31 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { + struct pcb *pcb; + struct trapframe *tf; + uint64_t stack; - /* XXX */ + pcb = td->td_pcb; + tf = td->td_frame; + stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15; + + bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0])); + bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp)); + pcb->pcb_fp_control = 0; + pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED | + FPCR_OVFD | FPCR_INED | FPCR_UNFD; + if (td != curthread) { + pcb->pcb_hw.apcb_usp = stack; + pcb->pcb_hw.apcb_unique = 0; + } else { + alpha_pal_wrusp(stack); + alpha_pal_wrunique(0); + } + tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET; + tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func; + tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox; + tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC]; /* aka. PV */ + tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } /* ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.430 2003/08/10 21:53:55 alc Exp $"); /* * Manages physical address maps. @@ -208,7 +208,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static void amd64_protection_init(void); -static void pmap_changebit(vm_page_t m, int bit, boolean_t setem) +static void pmap_clear_ptes(vm_page_t m, int bit) __always_inline; static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -1466,10 +1466,12 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; + vm_page_unlock_queues(); splx(s); } @@ -2609,17 +2611,17 @@ } /* - * this routine is used to modify bits in ptes + * Clear the given bit in each of the given page's ptes. */ static __inline void -pmap_changebit(vm_page_t m, int bit, boolean_t setem) +pmap_clear_ptes(vm_page_t m, int bit) { register pv_entry_t pv; - register pt_entry_t *pte; + pt_entry_t pbits, *pte; int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || - (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) + (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; s = splvm(); @@ -2632,7 +2634,7 @@ /* * don't write protect pager mappings */ - if (!setem && (bit == PG_RW)) { + if (bit == PG_RW) { if (!pmap_track_modified(pv->pv_va)) continue; } @@ -2645,26 +2647,20 @@ #endif pte = pmap_pte(pv->pv_pmap, pv->pv_va); - - if (setem) { - *pte |= bit; - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - } else { - pt_entry_t pbits = *pte; - if (pbits & bit) { - if (bit == PG_RW) { - if (pbits & PG_M) { - vm_page_dirty(m); - } - pte_store(pte, pbits & ~(PG_M|PG_RW)); - } else { - pte_store(pte, pbits & ~bit); + pbits = *pte; + if (pbits & bit) { + if (bit == PG_RW) { + if (pbits & PG_M) { + vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pte_store(pte, pbits & ~(PG_M|PG_RW)); + } else { + pte_store(pte, pbits & ~bit); } + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } } - if (!setem && bit == PG_RW) + if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); splx(s); } @@ -2679,7 +2675,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_changebit(m, PG_RW, FALSE); + pmap_clear_ptes(m, PG_RW); } else { pmap_remove_all(m); } @@ -2750,7 +2746,7 @@ void pmap_clear_modify(vm_page_t m) { - pmap_changebit(m, PG_M, FALSE); + pmap_clear_ptes(m, PG_M); } /* @@ -2761,7 +2757,7 @@ void pmap_clear_reference(vm_page_t m) { - pmap_changebit(m, PG_A, FALSE); + pmap_clear_ptes(m, PG_A); } /* ==== //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#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/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $ */ #include @@ -66,6 +66,7 @@ sprintf(buf, "%d", revision); setenv("hint.acpi.0.revision", buf, 1); sprintf(buf, "%6s", rsdp->OemId); + buf[6] = '\0'; setenv("hint.acpi.0.oem", buf, 1); sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress); setenv("hint.acpi.0.rsdt", buf, 1); ==== //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#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/boot/i386/libi386/biospnp.c,v 1.7 2002/09/23 18:54:26 alfred Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $ */ /* @@ -263,7 +263,7 @@ switch(*p) { case 'w': - i = va_arg(ap, uint); + i = va_arg(ap, u_int); *(u_int16_t *)argp = i; argp += sizeof(u_int16_t); break; ==== //depot/projects/netperf/sys/cam/scsi/scsi_da.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.150 2003/08/06 14:24:16 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.151 2003/08/06 17:30:03 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -146,21 +146,6 @@ static struct da_quirk_entry da_quirk_table[] = { -#ifdef DA_OLD_QUIRKS - /* - * Logitec USB/Firewire LHD-P30FU - */ - { - /* USB part */ - {T_DIRECT, SIP_MEDIA_FIXED, "HITACHI_", "DK23DA*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* Firewire part */ - {T_DIRECT, SIP_MEDIA_FIXED, "LSILogic", "SYM13FW*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, -#endif /* DA_OLD_QUIRKS */ { /* * Fujitsu M2513A MO drives. @@ -296,24 +281,6 @@ }, { /* - * Maxtor 3000LE USB Drive - */ - {T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * LaCie USB drive, among others - */ - {T_DIRECT, SIP_MEDIA_FIXED, "Maxtor*", "D080H4*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - {T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Microtech USB CameraMate */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", @@ -338,13 +305,6 @@ }, { /* - * Olympus digital cameras (D-370) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D-*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Olympus digital cameras (E-100RS, E-10). */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, @@ -367,34 +327,6 @@ }, { /* - * Nikon Coolpix E775/E995 Cameras - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Nikon Coolpix E885 Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Nikon", "Digital Camera", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * SimpleTech FlashLink UCF-100 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OEI-USB", "CompactFlash", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Minolta Dimage 2330 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DIMAGE 2330*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Minolta Dimage E203 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, @@ -402,21 +334,6 @@ }, { /* - * DIVA USB Mp3 Player. - * PR: kern/33638 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "DIVA USB", "Media Reader","*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Daisy Technology PhotoClip USB Camera - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Digital", "World DMC","*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Apacer HandyDrive * PR: kern/43627 */ @@ -433,22 +350,6 @@ }, { /* - * HP 315 Digital Camera - * PR: kern/41010 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "HP", "USB CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Fujitsu-Siemens Memorybird pen drive - * PR: kern/34712 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Fujitsu", "Memorybird", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Sony USB Key-Storage * PR: kern/46386 */ @@ -457,71 +358,12 @@ }, { /* - * Lexar Media Jumpdrive - * PR: kern/47006 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "LEXAR", "DIGITAL FILM", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Pentax USB Optio 230 camera - * PR: kern/46369 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, - "PENTAX", "DIGITAL_CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Casio QV-R3 USB camera (uses Pentax chip as above) - * PR: kern/46545 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, - "CASIO", "DIGITAL_CAMERA", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * M-Systems DiskOnKey USB flash key - * PR: kern/47793 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "M-Sys", "DiskOnKey", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * SanDisk ImageMate (I, II, ...) compact flash - * PR: kern/47877 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SanDisk", "ImageMate*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * Feiya "slider" dual-slot flash reader. The vendor field - * is blank so this may match other devices. - * PR: kern/50020 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "", "USB CARD READER", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * SmartDisk (Mitsumi) USB floppy drive * PR: kern/50226 */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, - { - /* - * OTi USB Flash Key - * PR: kern/51825 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OTi", "Flash Disk", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - } #endif /* DA_OLD_QUIRKS */ }; ==== //depot/projects/netperf/sys/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.65 2003/06/22 08:41:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.66 2003/08/06 18:40:49 phk Exp $"); #include "opt_mac.h" @@ -810,8 +810,6 @@ return 0; } -extern int swap_pager_full; - /* ARGSUSED */ int svr4_sys_break(td, uap) ==== //depot/projects/netperf/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1166 2003/08/03 13:39:59 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1168 2003/08/11 08:40:01 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -442,6 +442,7 @@ options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC +options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM options NGATM_ATM @@ -530,6 +531,9 @@ # MROUTING enables the kernel multicast packet forwarder, which works # with mrouted(8). # +# PIM enables Protocol Independent Multicast in the kernel. +# Requires MROUTING enabled. +# # IPFIREWALL enables support for IP firewall construction, in # conjunction with the `ipfw' program. IPFIREWALL_VERBOSE sends # logged packets to the system logger. IPFIREWALL_VERBOSE_LIMIT @@ -565,6 +569,7 @@ # using the trpt(8) utility. # options MROUTING # Multicast routing +options PIM # Protocol Independent Multicast options IPFIREWALL #firewall options IPFIREWALL_VERBOSE #enable logging to syslogd(8) options IPFIREWALL_FORWARD #enable transparent proxy support ==== //depot/projects/netperf/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.811 2003/07/22 11:41:15 ticso Exp $ +# $FreeBSD: src/sys/conf/files,v 1.813 2003/08/11 08:40:01 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,9 +75,9 @@ contrib/dev/acpica/dbexec.c optional acpi acpi_debug contrib/dev/acpica/dbfileio.c optional acpi acpi_debug contrib/dev/acpica/dbhistry.c optional acpi acpi_debug -contrib/dev/acpica/dbinput.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbinput.c optional acpi acpi_debug contrib/dev/acpica/dbstats.c optional acpi acpi_debug -contrib/dev/acpica/dbutils.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbutils.c optional acpi acpi_debug contrib/dev/acpica/dbxface.c optional acpi acpi_debug contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug contrib/dev/acpica/dmnames.c optional acpi acpi_debug @@ -101,7 +101,7 @@ contrib/dev/acpica/dswstate.c optional acpi contrib/dev/acpica/evevent.c optional acpi contrib/dev/acpica/evgpe.c optional acpi -contrib/dev/acpica/evgpeblk.c optional acpi nowerror +contrib/dev/acpica/evgpeblk.c optional acpi contrib/dev/acpica/evmisc.c optional acpi contrib/dev/acpica/evregion.c optional acpi contrib/dev/acpica/evrgnini.c optional acpi @@ -1338,6 +1338,8 @@ netatm/uni/unisig_subr.c optional atm_uni atm_core netatm/uni/unisig_util.c optional atm_uni atm_core netatm/uni/unisig_vc_state.c optional atm_uni atm_core +netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif +netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif netgraph/atm/ng_atm.c optional ngatm_atm netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async ==== //depot/projects/netperf/sys/conf/kern.post.mk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.48 2003/07/22 09:02:21 phk Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.49 2003/08/07 19:12:06 ru Exp $ # # In case the config had a makeoptions DESTDIR... @@ -178,7 +178,7 @@ fi .if exists(${DESTDIR}${KODIR}) -thiskernel=`sysctl -n kern.bootfile` ; \ - if [ "$$thiskernel" = ${DESTDIR}${KODIR}.old/${KERNEL_KO} ] ; then \ + if [ "`dirname "$$thiskernel"`" != ${DESTDIR}${KODIR} ] ; then \ chflags -R noschg ${DESTDIR}${KODIR} ; \ rm -rf ${DESTDIR}${KODIR} ; \ else \ @@ -187,9 +187,7 @@ rm -rf ${DESTDIR}${KODIR}.old ; \ fi ; \ mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \ - if [ "$$thiskernel" = ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ - sysctl kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \ - fi; \ + sysctl kern.bootfile=${DESTDIR}${KODIR}.old/"`basename "$$thiskernel"`" ; \ fi .endif mkdir -p ${DESTDIR}${KODIR} ==== //depot/projects/netperf/sys/conf/options#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.407 2003/08/03 13:39:59 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.409 2003/08/11 08:40:01 harti Exp $ # # On the handling of kernel options # @@ -322,6 +322,7 @@ ETHER_8022 opt_ef.h ETHER_SNAP opt_ef.h MROUTING opt_mrouting.h +PIM opt_mrouting.h INET opt_inet.h INET6 opt_inet6.h IPSEC opt_ipsec.h @@ -395,6 +396,7 @@ NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h +NETGRAPH_ATM_ATMPIF opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h ==== //depot/projects/netperf/sys/contrib/dev/acpica/acfreebsd.h#2 (text+ko) ==== @@ -118,8 +118,9 @@ #define __ACFREEBSD_H__ /* - * XXX this is technically correct, but will cause problems with some ASL - * which only works if the string names a Microsoft operating system. + * Some systems' ASL may have problems because they look for names + * of Microsoft operating systems. To override this, set hw.acpi.os_name + * to the appropriate string. */ #define ACPI_OS_NAME "FreeBSD" @@ -159,6 +160,8 @@ /* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS +#define ACPI_FLUSH_CPU_CACHE() +#include #define __cli() #define __sti() ==== //depot/projects/netperf/sys/dev/aac/aacvar.h#2 (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/aac/aacvar.h,v 1.35 2003/07/09 21:16:23 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.36 2003/08/07 15:04:24 jhb Exp $ */ #include @@ -314,7 +314,7 @@ /* command/fib resources */ bus_dma_tag_t aac_fib_dmat; /* DMA tag for allocing FIBs */ TAILQ_HEAD(,aac_fibmap) aac_fibmap_tqh; - uint total_fibs; + u_int total_fibs; struct aac_command *aac_commands; /* command management */ ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#2 (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.93 2003/07/20 00:52:57 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.94 2003/08/08 03:19:22 njl Exp $ */ #include "opt_acpi.h" @@ -433,8 +433,13 @@ SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "disable_on_poweroff", CTLFLAG_RD | CTLFLAG_RW, &sc->acpi_disable_on_poweroff, 0, "ACPI subsystem disable on poweroff"); + + /* + * Default to 5 seconds before sleeping to give some machines time to + * stabilize. + */ + sc->acpi_sleep_delay = 5; sc->acpi_disable_on_poweroff = 1; - sc->acpi_sleep_delay = 0; sc->acpi_s4bios = 1; if (bootverbose) sc->acpi_verbose = 1; ==== //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#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/dev/acpica/acpi_acad.c,v 1.14 2003/02/15 01:46:22 takawata Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.15 2003/08/11 15:34:43 njl Exp $ */ #include "opt_acpi.h" @@ -43,240 +43,230 @@ #include #include -/* - * Hooks for the ACPI CA debugging infrastructure - */ +/* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_AC_ADAPTER ACPI_MODULE_NAME("AC_ADAPTER") +/* Number of times to retry initialization before giving up. */ +#define ACPI_ACAD_RETRY_MAX 6 + #define ACPI_DEVICE_CHECK_PNP 0x00 #define ACPI_DEVICE_CHECK_EXISTENCE 0x01 #define ACPI_POWERSOURCE_STAT_CHANGE 0x80 -static void acpi_acad_get_status(void * ); -static void acpi_acad_notify_handler(ACPI_HANDLE , UINT32 ,void *); -static int acpi_acad_probe(device_t); -static int acpi_acad_attach(device_t); -static int acpi_acad_ioctl(u_long, caddr_t, void *); -static int acpi_acad_sysctl(SYSCTL_HANDLER_ARGS); -static void acpi_acad_init_acline(void *arg); +struct acpi_acad_softc { + int status; + int initializing; +}; + +static void acpi_acad_get_status(void *); +static void acpi_acad_notify_handler(ACPI_HANDLE, UINT32, void *); +static int acpi_acad_probe(device_t); +static int acpi_acad_attach(device_t); +static int acpi_acad_ioctl(u_long, caddr_t, void *); +static int acpi_acad_sysctl(SYSCTL_HANDLER_ARGS); +static void acpi_acad_init_acline(void *arg); + +static device_method_t acpi_acad_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, acpi_acad_probe), + DEVMETHOD(device_attach, acpi_acad_attach), -struct acpi_acad_softc { - int status; + {0, 0} +}; - int initializing; +static driver_t acpi_acad_driver = { + "acpi_acad", + acpi_acad_methods, + sizeof(struct acpi_acad_softc), }; +static devclass_t acpi_acad_devclass; +DRIVER_MODULE(acpi_acad, acpi, acpi_acad_driver, acpi_acad_devclass, 0, 0); + static void acpi_acad_get_status(void *context) { - int newstatus; - device_t dev = context; - struct acpi_acad_softc *sc = device_get_softc(dev); - ACPI_HANDLE h = acpi_get_handle(dev); + struct acpi_acad_softc *sc; + device_t dev; + ACPI_HANDLE h; + int newstatus; + + dev = context; + sc = device_get_softc(dev); + h = acpi_get_handle(dev); + if (ACPI_FAILURE(acpi_EvaluateInteger(h, "_PSR", &newstatus))) { + sc->status = -1; + return; + } - if (ACPI_FAILURE(acpi_EvaluateInteger(h, "_PSR", &newstatus))) { - sc->status = -1; - return; - } + if (sc->status != newstatus) { + sc->status = newstatus; - if (sc->status != newstatus) { - sc->status = newstatus; - /* set system power profile based on AC adapter status */ - power_profile_set_state(sc->status ? POWER_PROFILE_PERFORMANCE : POWER_PROFILE_ECONOMY); - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "%s Line\n",(sc->status) ? "On" : "Off"); - } + /* Set system power profile based on AC adapter status */ + power_profile_set_state(sc->status ? POWER_PROFILE_PERFORMANCE : + POWER_PROFILE_ECONOMY); + ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), + "%s Line\n", sc->status ? "On" : "Off"); + } } static void acpi_acad_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) { - device_t dev = context; + device_t dev = context; - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "Notify %d\n", notify); + ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), + "Notify %d\n", notify); - switch (notify) { - case ACPI_DEVICE_CHECK_PNP: - case ACPI_DEVICE_CHECK_EXISTENCE: - case ACPI_POWERSOURCE_STAT_CHANGE: - /*Temporally. It is better to notify policy manager*/ - AcpiOsQueueForExecution(OSD_PRIORITY_LO, - acpi_acad_get_status,context); - break; - default: - break; - } + switch (notify) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:03:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C2FF37B404; Thu, 14 Aug 2003 15:03:41 -0700 (PDT) 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 19FFE37B401 for ; Thu, 14 Aug 2003 15:03:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9396343FA3 for ; Thu, 14 Aug 2003 15:03:40 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EM3e0U084651 for ; Thu, 14 Aug 2003 15:03:40 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EM3eMt084648 for perforce@freebsd.org; Thu, 14 Aug 2003 15:03:40 -0700 (PDT) Date: Thu, 14 Aug 2003 15:03:40 -0700 (PDT) Message-Id: <200308142203.h7EM3eMt084648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36140 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, 14 Aug 2003 22:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=36140 Change 36140 by sam@sam_ebb on 2003/08/14 15:03:18 re-enable MPSAFE operation (somehow lost) Affected files ... .. //depot/projects/netperf/sys/pci/if_sis.c#5 edit .. //depot/projects/netperf/sys/pci/if_sisreg.h#2 edit Differences ... ==== //depot/projects/netperf/sys/pci/if_sis.c#5 (text+ko) ==== @@ -1228,7 +1228,7 @@ printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":"); sc->sis_unit = unit; - callout_handle_init(&sc->sis_stat_ch); + callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); /* @@ -1388,7 +1388,7 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU; /* Hook interrupt last to avoid having to lock softc */ - error = bus_setup_intr(dev, sc->sis_irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->sis_irq, INTR_TYPE_NET | INTR_MPSAFE, sis_intr, sc, &sc->sis_intrhand); if (error) { @@ -1751,7 +1751,7 @@ sis_start(ifp); } - sc->sis_stat_ch = timeout(sis_tick, sc, hz); + callout_reset(&sc->sis_stat_ch, hz, sis_tick, sc); sc->in_tick = 0; SIS_UNLOCK(sc); @@ -1967,6 +1967,7 @@ struct ifnet *ifp; { struct sis_softc *sc; + struct mbuf *m_head = NULL; u_int32_t idx; sc = ifp->if_softc; @@ -1976,15 +1977,15 @@ SIS_UNLOCK(sc); return; } + + idx = sc->sis_cdata.sis_tx_prod; + if (ifp->if_flags & IFF_OACTIVE) { SIS_UNLOCK(sc); return; } - idx = sc->sis_cdata.sis_tx_prod; while(sc->sis_ldata.sis_tx_list[idx].sis_mbuf == NULL) { - struct mbuf *m_head; - IF_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; @@ -2189,7 +2190,7 @@ ifp->if_flags &= ~IFF_OACTIVE; if (!sc->in_tick) - sc->sis_stat_ch = timeout(sis_tick, sc, hz); + callout_reset(&sc->sis_stat_ch, hz, sis_tick, sc); SIS_UNLOCK(sc); @@ -2327,7 +2328,7 @@ ifp = &sc->arpcom.ac_if; ifp->if_timer = 0; - untimeout(sis_tick, sc, sc->sis_stat_ch); + callout_stop(&sc->sis_stat_ch); ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); #ifdef DEVICE_POLLING ==== //depot/projects/netperf/sys/pci/if_sisreg.h#2 (text+ko) ==== @@ -459,7 +459,7 @@ bus_dma_tag_t sis_parent_tag; bus_dma_tag_t sis_tag; struct sis_ring_data sis_cdata; - struct callout_handle sis_stat_ch; + struct callout sis_stat_ch; #ifdef DEVICE_POLLING int rxcycles; #endif From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:04:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5C937B404; Thu, 14 Aug 2003 15:04:43 -0700 (PDT) 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 DE64637B401 for ; Thu, 14 Aug 2003 15:04:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E57E43FA3 for ; Thu, 14 Aug 2003 15:04:42 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EM4g0U084681 for ; Thu, 14 Aug 2003 15:04:42 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EM4gm6084678 for perforce@freebsd.org; Thu, 14 Aug 2003 15:04:42 -0700 (PDT) Date: Thu, 14 Aug 2003 15:04:42 -0700 (PDT) Message-Id: <200308142204.h7EM4gm6084678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36141 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, 14 Aug 2003 22:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=36141 Change 36141 by sam@sam_ebb on 2003/08/14 15:04:21 re-enable MPSAFE callouts (somehow lost) Affected files ... .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#5 edit .. //depot/projects/netperf/sys/dev/fxp/if_fxpvar.h#2 edit Differences ... ==== //depot/projects/netperf/sys/dev/fxp/if_fxp.c#5 (text+ko) ==== @@ -409,7 +409,7 @@ int s, ipcbxmit_disable; sc->dev = dev; - callout_handle_init(&sc->stat_ch); + callout_init(&sc->stat_ch, CALLOUT_MPSAFE); sysctl_ctx_init(&sc->sysctl_ctx); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); @@ -1877,7 +1877,7 @@ /* * Schedule another timeout one second from now. */ - sc->stat_ch = timeout(fxp_tick, sc, hz); + callout_reset(&sc->stat_ch, hz, fxp_tick, sc); FXP_UNLOCK(sc); splx(s); } @@ -1902,7 +1902,7 @@ /* * Cancel stats updater. */ - untimeout(fxp_tick, sc, sc->stat_ch); + callout_stop(&sc->stat_ch); /* * Issue software reset, which also unloads the microcode. @@ -2233,7 +2233,7 @@ /* * Start stats updater. */ - sc->stat_ch = timeout(fxp_tick, sc, hz); + callout_reset(&sc->stat_ch, hz, fxp_tick, sc); splx(s); } ==== //depot/projects/netperf/sys/dev/fxp/if_fxpvar.h#2 (text+ko) ==== @@ -174,7 +174,7 @@ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ u_int32_t stats_addr; /* DMA address of the stats structure */ int rx_idle_secs; /* # of seconds RX has been idle */ - struct callout_handle stat_ch; /* Handle for canceling our stat timeout */ + struct callout stat_ch; /* stat callout */ struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */ u_int32_t mcs_addr; /* DMA address of the multicast cmd */ struct ifmedia sc_media; /* media information */ From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:05:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DDC437B404; Thu, 14 Aug 2003 15:05:45 -0700 (PDT) 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 1E61737B401 for ; Thu, 14 Aug 2003 15:05:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A246743FA3 for ; Thu, 14 Aug 2003 15:05:44 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EM5i0U084795 for ; Thu, 14 Aug 2003 15:05:44 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EM5hWi084792 for perforce@freebsd.org; Thu, 14 Aug 2003 15:05:43 -0700 (PDT) Date: Thu, 14 Aug 2003 15:05:43 -0700 (PDT) Message-Id: <200308142205.h7EM5hWi084792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36142 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, 14 Aug 2003 22:05:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=36142 Change 36142 by sam@sam_ebb on 2003/08/14 15:04:47 re-enable MPSAFE operation (somehow lost) Affected files ... .. //depot/projects/netperf/sys/dev/wi/if_wi.c#4 edit Differences ... ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#4 (text+ko) ==== @@ -256,7 +256,7 @@ * NB: no locking is needed here; don't put it here * unless you can prove it! */ - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE, wi_intr, sc, &sc->wi_intrhand); if (error) { From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:06:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EC2737B404; Thu, 14 Aug 2003 15:06:47 -0700 (PDT) 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 0DC9437B401 for ; Thu, 14 Aug 2003 15:06:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91CB243FBD for ; Thu, 14 Aug 2003 15:06:46 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EM6k0U084841 for ; Thu, 14 Aug 2003 15:06:46 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EM6khh084838 for perforce@freebsd.org; Thu, 14 Aug 2003 15:06:46 -0700 (PDT) Date: Thu, 14 Aug 2003 15:06:46 -0700 (PDT) Message-Id: <200308142206.h7EM6khh084838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36143 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, 14 Aug 2003 22:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=36143 Change 36143 by sam@sam_ebb on 2003/08/14 15:06:12 enable MPSAFE callouts Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#7 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -226,8 +226,8 @@ if_printf(ifp, "failed to allocate descriptors: %d\n", error); goto bad; } - callout_init(&sc->sc_scan_ch, 0); - callout_init(&sc->sc_cal_ch, 0); + callout_init(&sc->sc_scan_ch, CALLOUT_MPSAFE); + callout_init(&sc->sc_cal_ch, CALLOUT_MPSAFE); mtx_init(&sc->sc_txbuflock, device_get_nameunit(sc->sc_dev), "xmit buf q", MTX_DEF); From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:08:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE75637B404; Thu, 14 Aug 2003 15:08:50 -0700 (PDT) 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 5DF2A37B401 for ; Thu, 14 Aug 2003 15:08:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFDC843F3F for ; Thu, 14 Aug 2003 15:08:49 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EM8n0U084889 for ; Thu, 14 Aug 2003 15:08:49 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EM8nZP084886 for perforce@freebsd.org; Thu, 14 Aug 2003 15:08:49 -0700 (PDT) Date: Thu, 14 Aug 2003 15:08:49 -0700 (PDT) Message-Id: <200308142208.h7EM8nZP084886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36144 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, 14 Aug 2003 22:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=36144 Change 36144 by sam@sam_ebb on 2003/08/14 15:08:14 replace instances of callout_init(..., 1) with callout_init(..., CALLOUT_MPSAFE); which has the same effect but makes it clear what the intent is. Affected files ... .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#2 edit .. //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#2 edit .. //depot/projects/netperf/sys/dev/rndtest/rndtest.c#2 edit .. //depot/projects/netperf/sys/dev/safe/safe.c#2 edit .. //depot/projects/netperf/sys/dev/ubsec/ubsec.c#2 edit .. //depot/projects/netperf/sys/kern/init_main.c#2 edit .. //depot/projects/netperf/sys/kern/kern_fork.c#3 edit .. //depot/projects/netperf/sys/kern/kern_synch.c#2 edit .. //depot/projects/netperf/sys/kern/sched_4bsd.c#2 edit .. //depot/projects/netperf/sys/kern/sched_ule.c#2 edit .. //depot/projects/netperf/sys/net/bpf.c#3 edit .. //depot/projects/netperf/sys/netinet/tcp_syncache.c#2 edit Differences ... ==== //depot/projects/netperf/sys/dev/hifn/hifn7751.c#2 (text+ko) ==== @@ -487,8 +487,7 @@ if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) hifn_init_pubrng(sc); - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_tickto, 1); + callout_init(&sc->sc_tickto, CALLOUT_MPSAFE); callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); return (0); @@ -687,8 +686,7 @@ sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLUOT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } ==== //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#2 (text+ko) ==== @@ -204,7 +204,7 @@ mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF); cv_init(&sc->vcc_cv, "vcc_close"); - callout_init(&sc->tst_callout, 1); + callout_init(&sc->tst_callout, CALLOUT_MPSAFE); sysctl_ctx_init(&sc->sysctl_ctx); ==== //depot/projects/netperf/sys/dev/rndtest/rndtest.c#2 (text+ko) ==== @@ -96,8 +96,7 @@ #if __FreeBSD_version < 500000 callout_init(&rsp->rs_to); #else - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&rsp->rs_to, 1); + callout_init(&rsp->rs_to, CALLOUT_MPSAFE); #endif } else device_printf(dev, "rndtest_init: no memory for state block\n"); ==== //depot/projects/netperf/sys/dev/safe/safe.c#2 (text+ko) ==== @@ -441,8 +441,7 @@ #endif safe_rng_init(sc); - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc); } #endif /* SAFE_NO_RNG */ ==== //depot/projects/netperf/sys/dev/ubsec/ubsec.c#2 (text+ko) ==== @@ -462,8 +462,7 @@ sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc); skip_rng: ; ==== //depot/projects/netperf/sys/kern/init_main.c#2 (text+ko) ==== @@ -386,8 +386,8 @@ bcopy("swapper", p->p_comm, sizeof ("swapper")); - callout_init(&p->p_itcallout, 1); - callout_init(&td->td_slpcallout, 1); + callout_init(&p->p_itcallout, CALLOUT_MPSAFE); + callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); /* Create credentials. */ p->p_ucred = crget(); ==== //depot/projects/netperf/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -594,7 +594,7 @@ PGRP_UNLOCK(p1->p_pgrp); LIST_INIT(&p2->p_children); - callout_init(&p2->p_itcallout, 1); + callout_init(&p2->p_itcallout, CALLOUT_MPSAFE); #ifdef KTRACE /* ==== //depot/projects/netperf/sys/kern/kern_synch.c#2 (text+ko) ==== @@ -659,7 +659,7 @@ void *dummy; { callout_init(&loadav_callout, 0); - callout_init(&lbolt_callout, 1); + callout_init(&lbolt_callout, CALLOUT_MPSAFE); /* Kick off timeout driven events by calling first time. */ loadav(NULL); ==== //depot/projects/netperf/sys/kern/sched_4bsd.c#2 (text+ko) ==== @@ -399,7 +399,7 @@ sched_quantum = SCHED_QUANTUM; hogticks = 2 * sched_quantum; - callout_init(&schedcpu_callout, 1); + callout_init(&schedcpu_callout, CALLOUT_MPSAFE); callout_init(&roundrobin_callout, 0); /* Kick off timeout driven events by calling first time. */ ==== //depot/projects/netperf/sys/kern/sched_ule.c#2 (text+ko) ==== @@ -569,7 +569,7 @@ kseq_cpu[i].ksq_cpus = cg->cg_count; } } - callout_init(&kseq_lb_callout, 1); + callout_init(&kseq_lb_callout, CALLOUT_MPSAFE); kseq_balance(NULL); #else kseq_setup(KSEQ_SELF()); ==== //depot/projects/netperf/sys/net/bpf.c#3 (text+ko) ==== @@ -355,7 +355,7 @@ mac_create_bpfdesc(td->td_ucred, d); #endif mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF); - callout_init(&d->bd_callout, 1); + callout_init(&d->bd_callout, CALLOUT_MPSAFE); return (0); } ==== //depot/projects/netperf/sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -258,7 +258,7 @@ /* Initialize the timer queues. */ for (i = 0; i <= SYNCACHE_MAXREXMTS; i++) { TAILQ_INIT(&tcp_syncache.timerq[i]); - callout_init(&tcp_syncache.tt_timerq[i], 1); + callout_init(&tcp_syncache.tt_timerq[i], CALLOUT_MPSAFE); } /* From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:41:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B003C37B401; Thu, 14 Aug 2003 15:41:32 -0700 (PDT) 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 1820C37B404 for ; Thu, 14 Aug 2003 15:41:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CAA343F3F for ; Thu, 14 Aug 2003 15:41:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7EMfU0U086211 for ; Thu, 14 Aug 2003 15:41:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7EMfTGQ086208 for perforce@freebsd.org; Thu, 14 Aug 2003 15:41:29 -0700 (PDT) Date: Thu, 14 Aug 2003 15:41:29 -0700 (PDT) Message-Id: <200308142241.h7EMfTGQ086208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36146 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, 14 Aug 2003 22:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=36146 Change 36146 by sam@sam_ebb on 2003/08/14 15:40:28 fix typo Affected files ... .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#3 edit Differences ... ==== //depot/projects/netperf/sys/dev/hifn/hifn7751.c#3 (text+ko) ==== @@ -686,7 +686,7 @@ sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - callout_init(&sc->sc_rngto, CALLUOT_MPSAFE); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } From owner-p4-projects@FreeBSD.ORG Fri Aug 15 14:34:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F23C37B404; Fri, 15 Aug 2003 14:34:18 -0700 (PDT) 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 0F1D837B401 for ; Fri, 15 Aug 2003 14:34:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A927143F3F for ; Fri, 15 Aug 2003 14:34:17 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7FLYH0U092499 for ; Fri, 15 Aug 2003 14:34:17 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FLYGMO092496 for perforce@freebsd.org; Fri, 15 Aug 2003 14:34:17 -0700 (PDT) Date: Fri, 15 Aug 2003 14:34:17 -0700 (PDT) Message-Id: <200308152134.h7FLYGMO092496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36216 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, 15 Aug 2003 21:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=36216 Change 36216 by sam@sam_ebb on 2003/08/15 14:34:03 announce MPSAFE interrupt handlers Affected files ... .. //depot/projects/netperf/sys/kern/subr_bus.c#2 edit Differences ... ==== //depot/projects/netperf/sys/kern/subr_bus.c#2 (text+ko) ==== @@ -2055,10 +2055,16 @@ bus_setup_intr(device_t dev, struct resource *r, int flags, driver_intr_t handler, void *arg, void **cookiep) { - if (dev->parent == 0) - return (EINVAL); - return (BUS_SETUP_INTR(dev->parent, dev, r, flags, - handler, arg, cookiep)); + int error; + + if (dev->parent != 0) { + error = BUS_SETUP_INTR(dev->parent, dev, r, flags, + handler, arg, cookiep); + if (error == 0 && (flags & INTR_MPSAFE)) + device_printf(dev, "[MPSAFE]\n"); + } else + error = EINVAL; + return (error); } int From owner-p4-projects@FreeBSD.ORG Fri Aug 15 14:41:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54A4F37B404; Fri, 15 Aug 2003 14:41:33 -0700 (PDT) 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 E046737B401 for ; Fri, 15 Aug 2003 14:41:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB7843FE0 for ; Fri, 15 Aug 2003 14:41:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7FLfV0U092906 for ; Fri, 15 Aug 2003 14:41:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FLfSg6092903 for perforce@freebsd.org; Fri, 15 Aug 2003 14:41:28 -0700 (PDT) Date: Fri, 15 Aug 2003 14:41:28 -0700 (PDT) Message-Id: <200308152141.h7FLfSg6092903@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 36220 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, 15 Aug 2003 21:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=36220 Change 36220 by jhb@jhb_laptop on 2003/08/15 14:40:58 IFC @36214. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/critical.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#50 integrate .. //depot/projects/smpng/sys/alpha/alpha/swtch.s#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#26 integrate .. //depot/projects/smpng/sys/alpha/include/critical.h#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/critical.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#4 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#43 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#26 integrate .. //depot/projects/smpng/sys/conf/NOTES#52 integrate .. //depot/projects/smpng/sys/conf/files#84 integrate .. //depot/projects/smpng/sys/conf/files.i386#45 integrate .. //depot/projects/smpng/sys/conf/files.ia64#31 integrate .. //depot/projects/smpng/sys/conf/files.pc98#46 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#24 integrate .. //depot/projects/smpng/sys/conf/majors#26 integrate .. //depot/projects/smpng/sys/conf/options#59 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_access.c#3 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#46 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#18 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#3 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#10 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#14 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#1 branch .. //depot/projects/smpng/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/smpng/sys/dev/ct/ct.c#3 integrate .. //depot/projects/smpng/sys/dev/dgb/dgb.c#13 integrate .. //depot/projects/smpng/sys/dev/dgb/dgreg.h#2 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#18 integrate .. //depot/projects/smpng/sys/dev/digi/digi.h#6 integrate .. //depot/projects/smpng/sys/dev/digi/digireg.h#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#13 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#7 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#19 integrate .. //depot/projects/smpng/sys/dev/en/midwayvar.h#7 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#23 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#12 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#10 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#22 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#10 integrate .. //depot/projects/smpng/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#40 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#11 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#17 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#2 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#29 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#33 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#16 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#7 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#2 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.c#6 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw.h#3 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#10 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#6 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#6 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#16 integrate .. //depot/projects/smpng/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/smpng/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/smpng/sys/dev/twe/twereg.h#4 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#15 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#22 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#5 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#22 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#62 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#6 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#15 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/mp_clock.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#50 integrate .. //depot/projects/smpng/sys/i386/i386/perfmon.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#11 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#11 integrate .. //depot/projects/smpng/sys/i386/include/apic.h#10 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#5 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#24 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#4 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#26 integrate .. //depot/projects/smpng/sys/i386/isa/cxreg.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/pcaudio.c#11 delete .. //depot/projects/smpng/sys/i386/isa/spic.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#14 integrate .. //depot/projects/smpng/sys/i386/isa/wt.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/critical.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#63 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#24 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#51 integrate .. //depot/projects/smpng/sys/ia64/ia64/ptrace_machdep.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.S#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#54 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#30 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#17 integrate .. //depot/projects/smpng/sys/ia64/include/critical.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#11 integrate .. //depot/projects/smpng/sys/ia64/include/ieeefp.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/ptrace.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/ucontext.h#4 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#44 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#23 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_blist.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#57 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#32 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#31 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#19 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#20 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#40 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#37 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#61 integrate .. //depot/projects/smpng/sys/libkern/arc4random.c#5 integrate .. //depot/projects/smpng/sys/libkern/random.c#4 integrate .. //depot/projects/smpng/sys/modules/Makefile#59 integrate .. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/en/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/atmpif/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#24 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#6 integrate .. //depot/projects/smpng/sys/net/if_atm.h#9 integrate .. //depot/projects/smpng/sys/net/if_loop.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ng_atmpif.h#1 branch .. //depot/projects/smpng/sys/netinet/if_atm.c#4 integrate .. //depot/projects/smpng/sys/netinet/in.h#22 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#33 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#23 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#40 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#13 integrate .. //depot/projects/smpng/sys/netinet/pim.h#1 branch .. //depot/projects/smpng/sys/netinet/pim_var.h#1 branch .. //depot/projects/smpng/sys/netinet/raw_ip.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#11 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#13 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#4 integrate .. //depot/projects/smpng/sys/netnatm/natm_pcb.c#5 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#18 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfsdiskless.h#5 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#18 integrate .. //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#9 delete .. //depot/projects/smpng/sys/pci/if_rl.c#35 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#29 integrate .. //depot/projects/smpng/sys/pci/meteor.c#9 integrate .. //depot/projects/smpng/sys/powerpc/include/critical.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/critical.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#27 integrate .. //depot/projects/smpng/sys/sparc64/include/critical.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#55 integrate .. //depot/projects/smpng/sys/sys/blist.h#6 integrate .. //depot/projects/smpng/sys/sys/buf.h#21 integrate .. //depot/projects/smpng/sys/sys/kse.h#13 integrate .. //depot/projects/smpng/sys/sys/mman.h#7 integrate .. //depot/projects/smpng/sys/sys/namei.h#11 integrate .. //depot/projects/smpng/sys/sys/param.h#46 integrate .. //depot/projects/smpng/sys/sys/pipe.h#5 integrate .. //depot/projects/smpng/sys/sys/proc.h#98 integrate .. //depot/projects/smpng/sys/sys/ptrace.h#9 integrate .. //depot/projects/smpng/sys/sys/queue.h#8 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#31 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#11 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#44 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#22 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#14 integrate .. //depot/projects/smpng/sys/vm/default_pager.c#5 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#11 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#10 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#31 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#12 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#35 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#16 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#16 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_kern.h#4 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#21 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#10 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#8 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#32 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/critical.c#5 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 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. */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.47 2003/08/12 19:33:35 jhb Exp $"); #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#50 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $"); #include #include @@ -1552,10 +1552,11 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; - + vm_page_unlock_queues(); splx(s); } ==== //depot/projects/smpng/sys/alpha/alpha/swtch.s#7 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.33 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.34 2003/08/12 19:33:35 jhb Exp $ */ #define _LOCORE ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#26 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $"); #include "opt_kstack_pages.h" @@ -248,8 +248,6 @@ void cpu_thread_exit(struct thread *td) { - - return; } void @@ -318,8 +316,31 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { + struct pcb *pcb; + struct trapframe *tf; + uint64_t stack; - /* XXX */ + pcb = td->td_pcb; + tf = td->td_frame; + stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15; + + bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0])); + bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp)); + pcb->pcb_fp_control = 0; + pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED | + FPCR_OVFD | FPCR_INED | FPCR_UNFD; + if (td != curthread) { + pcb->pcb_hw.apcb_usp = stack; + pcb->pcb_hw.apcb_unique = 0; + } else { + alpha_pal_wrusp(stack); + alpha_pal_wrunique(0); + } + tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET; + tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func; + tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox; + tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC]; /* aka. PV */ + tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } /* ==== //depot/projects/smpng/sys/alpha/include/critical.h#3 (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: @@ -11,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.2 2003/08/04 20:32:44 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.3 2003/08/12 23:24:03 imp Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.51 2003/08/04 23:40:35 scottl Exp $"); #include #include @@ -476,7 +476,8 @@ else pmap = NULL; - if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)) { + if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) && + map->pagesneeded == 0) { vm_offset_t vendaddr; /* ==== //depot/projects/smpng/sys/amd64/amd64/critical.c#4 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 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. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.11 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.430 2003/08/10 21:53:55 alc Exp $"); /* * Manages physical address maps. @@ -208,7 +208,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static void amd64_protection_init(void); -static void pmap_changebit(vm_page_t m, int bit, boolean_t setem) +static void pmap_clear_ptes(vm_page_t m, int bit) __always_inline; static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -1466,10 +1466,12 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; + vm_page_unlock_queues(); splx(s); } @@ -2609,17 +2611,17 @@ } /* - * this routine is used to modify bits in ptes + * Clear the given bit in each of the given page's ptes. */ static __inline void -pmap_changebit(vm_page_t m, int bit, boolean_t setem) +pmap_clear_ptes(vm_page_t m, int bit) { register pv_entry_t pv; - register pt_entry_t *pte; + pt_entry_t pbits, *pte; int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || - (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) + (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; s = splvm(); @@ -2632,7 +2634,7 @@ /* * don't write protect pager mappings */ - if (!setem && (bit == PG_RW)) { + if (bit == PG_RW) { if (!pmap_track_modified(pv->pv_va)) continue; } @@ -2645,26 +2647,20 @@ #endif pte = pmap_pte(pv->pv_pmap, pv->pv_va); - - if (setem) { - *pte |= bit; - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - } else { - pt_entry_t pbits = *pte; - if (pbits & bit) { - if (bit == PG_RW) { - if (pbits & PG_M) { - vm_page_dirty(m); - } - pte_store(pte, pbits & ~(PG_M|PG_RW)); - } else { - pte_store(pte, pbits & ~bit); + pbits = *pte; + if (pbits & bit) { + if (bit == PG_RW) { + if (pbits & PG_M) { + vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pte_store(pte, pbits & ~(PG_M|PG_RW)); + } else { + pte_store(pte, pbits & ~bit); } + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } } - if (!setem && bit == PG_RW) + if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); splx(s); } @@ -2679,7 +2675,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_changebit(m, PG_RW, FALSE); + pmap_clear_ptes(m, PG_RW); } else { pmap_remove_all(m); } @@ -2750,7 +2746,7 @@ void pmap_clear_modify(vm_page_t m) { - pmap_changebit(m, PG_M, FALSE); + pmap_clear_ptes(m, PG_M); } /* @@ -2761,7 +2757,7 @@ void pmap_clear_reference(vm_page_t m) { - pmap_changebit(m, PG_A, FALSE); + pmap_clear_ptes(m, PG_A); } /* ==== //depot/projects/smpng/sys/amd64/include/critical.h#3 (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: @@ -11,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.4 2003/08/04 20:32:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#5 (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/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $ */ #include @@ -66,6 +66,7 @@ sprintf(buf, "%d", revision); setenv("hint.acpi.0.revision", buf, 1); sprintf(buf, "%6s", rsdp->OemId); + buf[6] = '\0'; setenv("hint.acpi.0.oem", buf, 1); sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress); setenv("hint.acpi.0.rsdt", buf, 1); ==== //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.7 2002/09/23 18:54:26 alfred Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $ */ /* @@ -263,7 +263,7 @@ switch(*p) { case 'w': - i = va_arg(ap, uint); + i = va_arg(ap, u_int); *(u_int16_t *)argp = i; argp += sizeof(u_int16_t); break; ==== //depot/projects/smpng/sys/boot/powerpc/loader/start.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.2 2001/10/07 13:22:25 benno Exp $ */ +/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.3 2003/08/05 11:30:18 grehan Exp $ */ /* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */ /* @@ -38,63 +38,63 @@ void startup(void *, int, int (*)(void *), char *, int); #ifdef XCOFF_GLUE -asm(" - .text - .globl _entry -_entry: - .long _start,0,0 +asm(" \n\ + .text \n\ + .globl _entry \n\ +_entry: \n\ + .long _start,0,0 \n\ "); #endif -__asm(" - .data -stack: - .space 16388 - - .text - .globl _start -_start: - li 8,0 - li 9,0x100 - mtctr 9 -1: - dcbf 0,8 - icbi 0,8 - addi 8,8,0x20 - bdnz 1b - sync - isync - - lis 1,stack@ha - addi 1,1,stack@l - addi 1,1,8192 - - mfmsr 8 - li 0,0 - mtmsr 0 - isync - - mtibatu 0,0 - mtibatu 1,0 - mtibatu 2,0 - mtibatu 3,0 - mtdbatu 0,0 - mtdbatu 1,0 - mtdbatu 2,0 - mtdbatu 3,0 - - li 9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ - mtibatl 0,9 - mtdbatl 0,9 - li 9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ - mtibatu 0,9 - mtdbatu 0,9 - isync - - mtmsr 8 - isync - - b startup +__asm(" \n\ + .data \n\ +stack: \n\ + .space 16388 \n\ + \n\ + .text \n\ + .globl _start \n\ +_start: \n\ + li %r8,0 \n\ + li %r9,0x100 \n\ + mtctr %r9 \n\ +1: \n\ + dcbf %r0,%r8 \n\ + icbi %r0,%r8 \n\ + addi %r8,%r8,0x20 \n\ + bdnz 1b \n\ + sync \n\ + isync \n\ + \n\ + lis %r1,stack@ha \n\ + addi %r1,%r1,stack@l \n\ + addi %r1,%r1,8192 \n\ + \n\ + mfmsr %r8 \n\ + li %r0,0 \n\ + mtmsr %r0 \n\ + isync \n\ + \n\ + mtibatu 0,%r0 \n\ + mtibatu 1,%r0 \n\ + mtibatu 2,%r0 \n\ + mtibatu 3,%r0 \n\ + mtdbatu 0,%r0 \n\ + mtdbatu 1,%r0 \n\ + mtdbatu 2,%r0 \n\ + mtdbatu 3,%r0 \n\ + \n\ + li %r9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ \n\ + mtibatl 0,%r9 \n\ + mtdbatl 0,%r9 \n\ + li %r9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ \n\ + mtibatu 0,%r9 \n\ + mtdbatu 0,%r9 \n\ + isync \n\ + \n\ + mtmsr %r8 \n\ + isync \n\ + \n\ + b startup \n\ "); void ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#43 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.149 2003/07/29 18:08:16 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.151 2003/08/06 17:30:03 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -146,22 +146,7 @@ static struct da_quirk_entry da_quirk_table[] = { -#ifdef DA_OLD_QUIRKS - /* - * Logitec USB/Firewire LHD-P30FU - */ { - /* USB part */ - {T_DIRECT, SIP_MEDIA_FIXED, "HITACHI_", "DK23DA*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* Firewire part */ - {T_DIRECT, SIP_MEDIA_FIXED, "LSILogic", "SYM13FW*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, -#endif /* DA_OLD_QUIRKS */ - { /* * Fujitsu M2513A MO drives. * Tested devices: M2513A2 firmware versions 1200 & 1300. @@ -296,24 +281,6 @@ }, { /* - * Maxtor 3000LE USB Drive - */ - {T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* - * LaCie USB drive, among others - */ - {T_DIRECT, SIP_MEDIA_FIXED, "Maxtor*", "D080H4*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - {T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Microtech USB CameraMate */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", @@ -338,13 +305,6 @@ }, { /* - * Olympus digital cameras (D-370) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D-*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE - }, - { - /* * Olympus digital cameras (E-100RS, E-10). */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, @@ -367,34 +327,6 @@ }, { /* - * Nikon Coolpix E775/E995 Cameras - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"}, - /*quirks*/ DA_Q_NO_6_BYTE >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:37:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BF2337B404; Fri, 15 Aug 2003 15:37:50 -0700 (PDT) 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 B4A1237B442 for ; Fri, 15 Aug 2003 15:37:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 526DC43FCB for ; Fri, 15 Aug 2003 15:37:48 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7FMbm0U096564 for ; Fri, 15 Aug 2003 15:37:48 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FMblMg096561 for perforce@freebsd.org; Fri, 15 Aug 2003 15:37:47 -0700 (PDT) Date: Fri, 15 Aug 2003 15:37:47 -0700 (PDT) Message-Id: <200308152237.h7FMblMg096561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36226 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, 15 Aug 2003 22:37:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=36226 Change 36226 by sam@sam_ebb on 2003/08/15 15:37:28 slight mods to eliminate multiple references to constants like MSIZE; this simplifies switching the mbuf object size to a page for debugging Affected files ... .. //depot/projects/netperf/sys/kern/subr_mbuf.c#4 edit Differences ... ==== //depot/projects/netperf/sys/kern/subr_mbuf.c#4 (text+ko) ==== @@ -391,8 +391,12 @@ &(mb_list_mbuf.ml_maptop), mb_map_size); mb_list_mbuf.ml_map->system_map = 1; mb_list_mbuf.ml_mapfull = 0; +#if 1 mb_list_mbuf.ml_objsize = MSIZE; - mb_list_mbuf.ml_objbucks = MBUF_BUCK_SZ / MSIZE; +#else + mb_list_mbuf.ml_objsize = PAGE_SIZE; +#endif + mb_list_mbuf.ml_objbucks = MBUF_BUCK_SZ / mb_list_mbuf.ml_objsize; mb_list_mbuf.ml_wmhigh = &mbuf_hiwm; mb_list_mbuf.ml_wmlow = &mbuf_lowm; @@ -408,7 +412,7 @@ mb_list_clust.ml_map->system_map = 1; mb_list_clust.ml_mapfull = 0; mb_list_clust.ml_objsize = MCLBYTES; - mb_list_clust.ml_objbucks = CLUST_BUCK_SZ / MCLBYTES; + mb_list_clust.ml_objbucks = CLUST_BUCK_SZ / mb_list_clust.ml_objsize; mb_list_clust.ml_wmhigh = &clust_hiwm; mb_list_clust.ml_wmlow = &clust_lowm; @@ -465,14 +469,14 @@ /* * Initialize general mbuf statistics. */ - mbstat.m_msize = MSIZE; - mbstat.m_mclbytes = MCLBYTES; + mbstat.m_msize = mb_list_mbuf.ml_objsize; + mbstat.m_mclbytes = mb_list_clust.ml_objsize; mbstat.m_minclsize = MINCLSIZE; mbstat.m_mlen = MLEN; mbstat.m_mhlen = MHLEN; mbstat.m_numtypes = MT_NTYPES; - mbstat.m_mbperbuck = MBUF_BUCK_SZ / MSIZE; - mbstat.m_clperbuck = CLUST_BUCK_SZ / MCLBYTES; + mbstat.m_mbperbuck = mb_list_mbuf.ml_objbucks; + mbstat.m_clperbuck = mb_list_clust.ml_objbucks; /* * Allocate and initialize PCPU containers. From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:39:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A56C37B40D; Fri, 15 Aug 2003 15:39:53 -0700 (PDT) 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 D489E37B401 for ; Fri, 15 Aug 2003 15:39:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1690843FAF for ; Fri, 15 Aug 2003 15:39:52 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7FMdp0U096748 for ; Fri, 15 Aug 2003 15:39:51 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FMdpjm096745 for perforce@freebsd.org; Fri, 15 Aug 2003 15:39:51 -0700 (PDT) Date: Fri, 15 Aug 2003 15:39:51 -0700 (PDT) Message-Id: <200308152239.h7FMdpjm096745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36228 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, 15 Aug 2003 22:39:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=36228 Change 36228 by sam@sam_ebb on 2003/08/15 15:39:22 Release the softc lock around ieee80211_input to avoid LOR's. This is consistent with other drivers but suboptimal. Affected files ... .. //depot/projects/netperf/sys/dev/wi/if_wi.c#5 edit Differences ... ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#5 (text+ko) ==== @@ -1530,7 +1530,9 @@ /* * Send frame up for processing. */ + WI_UNLOCK(sc); ieee80211_input(ifp, m, ni, rssi, rstamp); + WI_LOCK(sc); /* * The frame may have caused the node to be marked for * reclamation (e.g. in response to a DEAUTH message) From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:43:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7007537B404; Fri, 15 Aug 2003 15:43:58 -0700 (PDT) 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 0EDA137B401 for ; Fri, 15 Aug 2003 15:43:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A504E43F75 for ; Fri, 15 Aug 2003 15:43:57 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7FMhv0U096981 for ; Fri, 15 Aug 2003 15:43:57 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7FMhv9w096978 for perforce@freebsd.org; Fri, 15 Aug 2003 15:43:57 -0700 (PDT) Date: Fri, 15 Aug 2003 15:43:57 -0700 (PDT) Message-Id: <200308152243.h7FMhv9w096978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36229 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, 15 Aug 2003 22:43:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=36229 Change 36229 by sam@sam_ebb on 2003/08/15 15:43:48 DP83815 "short cable fix" for Soekris equipment. Tested on a variety of 4511, 4501, 4521, and 4801 boxes w/o negative effect (but wasn't experiencing the problem before so don't know if it actually fixes the problem). Affected files ... .. //depot/projects/netperf/sys/pci/if_sis.c#6 edit Differences ... ==== //depot/projects/netperf/sys/pci/if_sis.c#6 (text+ko) ==== @@ -2148,6 +2148,29 @@ SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS); } + if (sc->sis_type == SIS_TYPE_83815 && + IFM_SUBTYPE(mii->mii_media_active) == IFM_100_TX) { + uint32_t reg; + + /* + * Some DP83815s experience problems when used with short + * (< 30m/100ft) Ethernet cables in 100BaseTX mode. This + * sequence adjusts the DSP's signal attenuation to fix the + * problem. + */ + CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001); + + reg = CSR_READ_4(sc, NS_PHY_DSPCFG); + CSR_WRITE_4(sc, NS_PHY_DSPCFG, (reg & 0xfff) | 0x1000); + DELAY(100); + reg = CSR_READ_4(sc, NS_PHY_TDATA); + if ((reg & 0x0080) == 0 || (reg & 0xff) >= 0xd8) { + CSR_WRITE_4(sc, NS_PHY_TDATA, 0x00e8); + SIS_SETBIT(sc, NS_PHY_DSPCFG, 0x20); + } + CSR_WRITE_4(sc, NS_PHY_PAGE, 0); + } + /* * Enable interrupts. */ From owner-p4-projects@FreeBSD.ORG Fri Aug 15 17:08:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E59B37B404; Fri, 15 Aug 2003 17:08:43 -0700 (PDT) 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 DC06A37B401 for ; Fri, 15 Aug 2003 17:08:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B0EF43FAF for ; Fri, 15 Aug 2003 17:08:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7G08g0U007473 for ; Fri, 15 Aug 2003 17:08:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7G08gEk007470 for perforce@freebsd.org; Fri, 15 Aug 2003 17:08:42 -0700 (PDT) Date: Fri, 15 Aug 2003 17:08:42 -0700 (PDT) Message-Id: <200308160008.h7G08gEk007470@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 36233 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, 16 Aug 2003 00:08:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=36233 Change 36233 by marcel@marcel_nfs on 2003/08/15 17:08:06 Revert debugging code. We never hit the condition when it was expected and interferes with other fixes that cause us to hit this condition by mistake. When the condition hits we also trigger a LOR, so it's really getting in the way. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#90 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#90 (text+ko) ==== @@ -878,26 +878,11 @@ int oonstack; td = curthread; - tf = td->td_frame; - - /* - * Bail out if we're sending a signal due to a fault in the gateway - * page. If that happens, we were trying to send a signal but the - * backing store address was invalid. Trying to send a signal in that - * case will not work. - * Note that the test for region 5 is a bit sloppy, but does not - * give false positives. - */ - if ((tf->tf_special.iip >> 61) == 5) { - printf("XXX: Fault in gateway page. Cannot send signal.\n"); - sigexit(td, SIGSEGV); - return; - } - p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); + tf = td->td_frame; sp = tf->tf_special.sp; oonstack = sigonstack(sp); sbs = 0; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 19:55:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6E5F37B404; Fri, 15 Aug 2003 19:55:09 -0700 (PDT) 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 7D73137B401 for ; Fri, 15 Aug 2003 19:55:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B9ED43FD7 for ; Fri, 15 Aug 2003 19:55:08 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7G2t80U014982 for ; Fri, 15 Aug 2003 19:55:08 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7G2t6kE014979 for perforce@freebsd.org; Fri, 15 Aug 2003 19:55:06 -0700 (PDT) Date: Fri, 15 Aug 2003 19:55:06 -0700 (PDT) Message-Id: <200308160255.h7G2t6kE014979@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 36239 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, 16 Aug 2003 02:55:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=36239 Change 36239 by marcel@marcel_nfs on 2003/08/15 19:54:13 IFC @36237 Affected files ... .. //depot/projects/ia64/bin/ps/extern.h#10 integrate .. //depot/projects/ia64/bin/ps/keyword.c#13 integrate .. //depot/projects/ia64/bin/ps/print.c#13 integrate .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#38 integrate .. //depot/projects/ia64/etc/rc.d/routing#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 integrate .. //depot/projects/ia64/lib/libpthread/test/Makefile#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 integrate .. //depot/projects/ia64/sbin/Makefile#29 integrate .. //depot/projects/ia64/sbin/ffsinfo/Makefile#4 integrate .. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#7 integrate .. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#3 integrate .. //depot/projects/ia64/sbin/growfs/debug.c#5 integrate .. //depot/projects/ia64/sbin/growfs/debug.h#2 integrate .. //depot/projects/ia64/sbin/natd/natd.8#9 integrate .. //depot/projects/ia64/sbin/natd/natd.c#7 integrate .. //depot/projects/ia64/sbin/rtsol/Makefile#3 integrate .. //depot/projects/ia64/share/man/man3/queue.3#4 integrate .. //depot/projects/ia64/share/man/man4/aha.4#3 integrate .. //depot/projects/ia64/share/man/man4/amr.4#4 integrate .. //depot/projects/ia64/share/man/man4/an.4#5 integrate .. //depot/projects/ia64/share/man/man4/ath.4#6 integrate .. //depot/projects/ia64/share/man/man4/awi.4#4 integrate .. //depot/projects/ia64/share/man/man4/ieee80211.4#3 integrate .. //depot/projects/ia64/share/man/man4/mlx.4#4 integrate .. //depot/projects/ia64/share/man/man4/wi.4#28 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#44 integrate .. //depot/projects/ia64/share/misc/iso3166#6 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#8 integrate .. //depot/projects/ia64/sys/conf/files.i386#43 integrate .. //depot/projects/ia64/sys/conf/files.ia64#44 integrate .. //depot/projects/ia64/sys/conf/files.pc98#35 integrate .. //depot/projects/ia64/sys/conf/majors#24 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#36 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#12 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/dgb/dgb.c#10 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#34 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#34 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#33 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#17 integrate .. //depot/projects/ia64/sys/dev/safe/safe.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#19 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#27 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#40 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#28 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#44 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/mp_clock.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/perfmon.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#56 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#10 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#35 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#7 integrate .. //depot/projects/ia64/sys/i386/include/clock.h#6 integrate .. //depot/projects/ia64/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#20 integrate .. //depot/projects/ia64/sys/i386/isa/pcaudio.c#8 delete .. //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/ptrace_machdep.c#1 branch .. //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#7 integrate .. //depot/projects/ia64/sys/ia64/include/ptrace.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#65 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_kobj.c#4 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#39 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#24 integrate .. //depot/projects/ia64/sys/libkern/arc4random.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#43 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#16 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/ia64/sys/nfsclient/nfsdiskless.h#4 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/ia64/sys/pc98/pc98/pcaudio.c#7 delete .. //depot/projects/ia64/sys/pci/if_rl.c#41 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/swtch.S#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#22 integrate .. //depot/projects/ia64/sys/sys/pipe.h#8 integrate .. //depot/projects/ia64/sys/sys/proc.h#74 integrate .. //depot/projects/ia64/sys/sys/ptrace.h#4 integrate .. //depot/projects/ia64/sys/sys/queue.h#7 integrate .. //depot/projects/ia64/sys/sys/soundcard.h#6 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_balloc.c#10 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#37 integrate .. //depot/projects/ia64/sys/ufs/ufs/inode.h#8 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#12 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#39 integrate .. //depot/projects/ia64/sys/vm/vm_extern.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#62 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#44 integrate .. //depot/projects/ia64/tools/tools/ministat/Makefile#1 branch .. //depot/projects/ia64/tools/tools/ministat/README#1 branch .. //depot/projects/ia64/tools/tools/ministat/chameleon#1 branch .. //depot/projects/ia64/tools/tools/ministat/iguana#1 branch .. //depot/projects/ia64/tools/tools/ministat/ministat.c#1 branch .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.birthday#10 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#36 integrate .. //depot/projects/ia64/usr.bin/tail/forward.c#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.c#8 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#9 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/recvjob.c#5 integrate .. //depot/projects/ia64/usr.sbin/nghook/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/nghook/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/nghook/nghook.8#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#11 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.h#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/dump.c#5 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.8#4 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.c#7 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf#2 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf.5#4 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.h#5 integrate .. //depot/projects/ia64/usr.sbin/rtsold/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/rtsold/rtsol.c#4 integrate .. //depot/projects/ia64/usr.sbin/rtsold/rtsold.c#5 integrate Differences ... ==== //depot/projects/ia64/bin/ps/extern.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.30 2003/01/19 00:22:34 jmallett Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.31 2003/08/13 07:35:07 harti Exp $ */ struct kinfo; @@ -63,6 +63,7 @@ void maxrss(KINFO *, VARENT *); void lockname(KINFO *, VARENT *); void mwchan(KINFO *, VARENT *); +void nwchan(KINFO *, VARENT *); void pagein(KINFO *, VARENT *); void parsefmt(const char *, int); void pcpu(KINFO *, VARENT *); ==== //depot/projects/ia64/bin/ps/keyword.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.63 2003/04/12 10:39:56 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.64 2003/08/13 07:35:07 harti Exp $"); #include #include @@ -127,6 +127,7 @@ LONG, "ld", 0}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld", 0}, + {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld", 0}, {"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, ==== //depot/projects/ia64/bin/ps/print.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.82 2003/04/15 18:49:20 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.83 2003/08/13 07:35:07 harti Exp $"); #include #include @@ -457,6 +457,19 @@ } void +nwchan(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (k->ki_p->ki_wchan) { + (void)printf("%0*lx", v->width, + (long)k->ki_p->ki_wchan); + } else + (void)printf("%-*s", v->width, "-"); +} + +void mwchan(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.23 2003/05/11 18:17:00 markm Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.25 2003/08/13 11:02:37 harti Exp $"); #include "telnetd.h" #include "pathnames.h" @@ -348,6 +348,9 @@ err(1, "socket"); (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)); + if (debug > 1) + (void) setsockopt(s, SOL_SOCKET, SO_DEBUG, + (char *)&on, sizeof(on)); if (bind(s, res->ai_addr, res->ai_addrlen) < 0) err(1, "bind"); if (listen(s, 1) < 0) @@ -356,6 +359,8 @@ ns = accept(s, res->ai_addr, &foo); if (ns < 0) err(1, "accept"); + (void) setsockopt(ns, SOL_SOCKET, SO_DEBUG, + (char *)&on, sizeof(on)); (void) dup2(ns, 0); (void) close(ns); (void) close(s); ==== //depot/projects/ia64/etc/defaults/rc.conf#38 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.183 2003/08/08 17:43:58 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.184 2003/08/14 15:27:32 harti Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -219,6 +219,7 @@ ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). +natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. router_enable="NO" # Set to YES to enable a routing daemon. router="/sbin/routed" # Name of routing daemon to use if enabled. ==== //depot/projects/ia64/etc/rc.d/routing#3 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.138 2003/06/29 17:59:09 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.139 2003/08/14 15:27:32 harti Exp $ # # PROVIDE: routing @@ -48,6 +48,14 @@ route add ${route_args} done fi + # Now ATM static routes + # + if [ -n "${natm_static_routes}" ]; then + for i in ${natm_static_routes}; do + eval route_args=\$route_${i} + atmconfig natm add ${route_args} + done + fi } options_start() ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile,v 1.1 2003/04/26 03:28:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile,v 1.2 2003/08/14 14:43:28 ru Exp $ .include "${.CURDIR}/../Makefile.inc0" -NOMAN= true SRCS+= obj-elf.c tc-i386.c .include ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/Makefile,v 1.9 2001/10/15 01:43:22 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/Makefile,v 1.10 2003/08/14 14:43:29 ru Exp $ .include "${.CURDIR}/../Makefile.inc0" +.if ${TARGET_ARCH} != "i386" NOMAN= true -.if ${TARGET_ARCH} != "i386" BINDIR= /usr/libexec/cross/i386-freebsd .endif SRCS+= obj-elf.c tc-i386.c ==== //depot/projects/ia64/lib/libpthread/test/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.11 2002/12/08 22:43:31 deischen Exp $ +# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.12 2003/08/13 03:59:18 marcel Exp $ # # Automated test suite for libpthread (pthreads). # @@ -29,6 +29,7 @@ LIBS := -lkse # Flags passed to verify. "-v" or "-u" may be useful. +VERIFY = perl verify VFLAGS := all : default @@ -82,21 +83,21 @@ @cp $(bin)_a $(bin) .endfor @echo "Test static library:" - @./verify $(VFLAGS) $(CTESTS) $(PTESTS) + @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS) check_p : tests_p .for bin in $(CTESTS) $(BTESTS) @cp $(bin)_p $(bin) .endfor @echo "Test profile library:" - @./verify $(VFLAGS) $(CTESTS) $(PTESTS) + @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS) check_s : tests_s .for bin in $(CTESTS) $(BTESTS) @cp $(bin)_s $(bin) .endfor @echo "Test shared library:" - @./verify $(VFLAGS) $(CTESTS) $(PTESTS) + @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS) check : check_a check_p check_s ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.164 2003/08/12 00:14:49 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.166 2003/08/15 22:50:25 bmah Exp $ Supported Devices @@ -127,19 +127,15 @@ + + Adaptec 1510, 152X, 1535, and 154X-series ISA + SCSI controllers and compatibles (&man.aha.4; driver) + + Adaptec 164X-series MCA SCSI controllers + (&man.aha.4; driver) + Adaptec SCSI Controllers - - Adaptec 1535 ISA SCSI controllers - - - Adaptec 154x series ISA SCSI controllers - (&man.aha.4; driver) - - - Adaptec 164x series MCA SCSI controllers (&man.aha.4; - driver) - Adaptec 174x series EISA SCSI controller in standard and enhanced mode (&man.aha.4; and &man.ahb.4; driver) @@ -166,14 +162,6 @@ SCSI controllers (&man.ahc.4; driver) - Adaptec 1510 series ISA SCSI controllers (not for - bootable devices) - - - Adaptec 152x series ISA SCSI controllers (&man.aha.4; - driver) - - Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x and SoundBlaster SCSI cards (&man.aic.4; driver) @@ -212,43 +200,7 @@ Adaptec 2400A ATA-100 RAID controller (&man.asr.4; driver) - Adaptec FSA family RAID controllers (&man.aac.4; driver) - - - Adaptec AAC-2622 - - - Adaptec AAC-364 - - - Adaptec SCSI RAID 2120S - - - Adaptec SCSI RAID 2200S - - - Adaptec SCSI RAID 5400S - - - Dell PERC 2/QC - - - Dell PERC 2/Si - - - Dell PERC 3/Di - - - Dell PERC 3/QC - - - Dell PERC 3/Si - - - HP NetRAID-4M - - - + Adaptec FSA family RAID controllers (&man.aac.4; driver) NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver) @@ -503,66 +455,6 @@ AMI MegaRAID Express and Enterprise family RAID controllers (&man.amr.4; driver) - - - MegaRAID Series 418 - - - MegaRAID Enterprise 1200 (Series 428) - - - MegaRAID Enterprise 1300 (Series 434) - - - MegaRAID Enterprise 1400 (Series 438) - - - MegaRAID Enterprise 1500 (Series 467) - - - MegaRAID Enterprise 1600 (Series 471) - - - MegaRAID Elite 1500 (Series 467) - - - MegaRAID Elite 1600 (Series 493) - - - MegaRAID Express 100 (Series 466WS) - - - MegaRAID Express 200 (Series 466) - - - MegaRAID Express 300 (Series 490) - - - MegaRAID Express 500 (Series 475) - - - Dell PERC - - - Dell PERC 2/SC - - - Dell PERC 2/DC - - - Dell PERC 3/DCL - - - HP NetRaid-1si - - - HP NetRaid-3si - - - HP Embedded NetRaid - - - Booting from these controllers is supported. EISA adapters are not supported. @@ -574,35 +466,6 @@ Mylex DAC960 and DAC1100 RAID controllers with 2.x, 3.x, 4.x and 5.x firmware (&man.mlx.4; driver) - - - DAC960P - - - DAC960PD - - - DAC960PDU - - - DAC960PL - - - DAC960PJ - - - DAC960PG - - - AcceleRAID 150 - - - AcceleRAID 250 - - - eXtremeRAID 1100 - - Booting from these controllers is supported. EISA adapters ==== //depot/projects/ia64/sbin/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.124 2003/07/24 01:42:49 peter Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.125 2003/08/14 18:55:57 rwatson Exp $ # XXX MISSING: icheck ncheck @@ -19,6 +19,7 @@ dump \ dumpfs \ dumpon \ + ffsinfo \ fsck \ fsck_ffs \ fsck_msdosfs \ ==== //depot/projects/ia64/sbin/ffsinfo/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 8.8 (Berkeley) 6/21/2000 # # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $ -# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.5 2003/06/11 23:24:31 obrien Exp $ +# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.6 2003/08/14 18:55:31 rwatson Exp $ # MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG @@ -15,5 +15,7 @@ WARNS?= 0 CFLAGS+=-DFS_DEBUG -I${GROWFS} +DPADD= ${LIBUFS} +LDADD= -lufs .include ==== //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#7 (text+ko) ==== @@ -35,7 +35,7 @@ .\" SUCH DAMAGE. .\" .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $ -.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.12 2002/08/21 18:10:14 trhodes Exp $ +.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.13 2003/08/14 18:55:31 rwatson Exp $ .\" .Dd September 8, 2000 .Dt FSINFO 8 @@ -45,7 +45,6 @@ .Nd "dump all meta information of an existing ufs file system" .Sh SYNOPSIS .Nm -.Op Fl L .Op Fl g Ar cylinder_group .Op Fl i Ar inode .Op Fl l Ar level @@ -65,9 +64,6 @@ .Pp The following options are available: .Bl -tag -width indent -.It Fl L -Specifying this option skips the tests of the disklabel. -This is done automatically, if the specified filename to dump is a plain file. .It Fl g Ar cylinder_group This restricts the dump to information about this cylinder group only. Here @@ -104,8 +100,6 @@ fragment allocation bitmap .It Ar 0x040 cluster maps and summary -.It Ar 0x080 -rotational layout tables .It Ar 0x100 inode information .It Ar 0x200 @@ -126,13 +120,7 @@ .Pa /dev/vinum/testvol with all available information. .Sh BUGS -Currently -.Nm -can only dump unmounted file systems. -Do not try dumping a mounted file system, your system may panic and you will -not be able to use the file system any longer. -.Pp -Also snapshots are handled like plain files. +Snapshots are handled like plain files. They should get their own level to provide for independent control of the amount of what gets dumped. It probably also makes sense to some extend to dump the snapshot as a ==== //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#3 (text+ko) ==== @@ -48,19 +48,25 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.5 2002/08/21 18:10:14 trhodes Exp $"; + "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.6 2003/08/14 18:55:31 rwatson Exp $"; #endif /* not lint */ /* ********************************************************** INCLUDES ***** */ #include #include +#include #include -#include -#include +#include +#include +#include + #include #include #include +#include +#include +#include #include #include #include @@ -72,20 +78,18 @@ int _dbg_lvl_ = (DL_INFO); /* DL_TRC */ #endif /* FS_DEBUG */ +struct uufsd disk; + +#define sblock disk.d_fs +#define acg disk.d_cg + static union { - struct fs fs; - char pad[SBSIZE]; -} fsun1, fsun2; -#define sblock fsun1.fs -#define osblock fsun2.fs + struct fs fs; + char pad[SBLOCKSIZE]; +} fsun; -static union { - struct cg cg; - char pad[MAXBSIZE]; -} cgun1; -#define acg cgun1.cg +#define osblock fsun.fs -static char ablk[MAXBSIZE]; static char i1blk[MAXBSIZE]; static char i2blk[MAXBSIZE]; static char i3blk[MAXBSIZE]; @@ -93,36 +97,14 @@ static struct csum *fscs; /* ******************************************************** PROTOTYPES ***** */ -static void rdfs(daddr_t, size_t, void *, int); static void usage(void); -static struct disklabel *get_disklabel(int); -static struct dinode *ginode(ino_t, int); -static void dump_whole_inode(ino_t, int, int); +static void dump_whole_ufs1_inode(ino_t, int); +static void dump_whole_ufs2_inode(ino_t, int); -/* ************************************************************** rdfs ***** */ -/* - * Here we read some block(s) from disk. - */ -void -rdfs(daddr_t bno, size_t size, void *bf, int fsi) -{ - DBG_FUNC("rdfs") - ssize_t n; - - DBG_ENTER; - - if (lseek(fsi, (off_t)bno * DEV_BSIZE, 0) < 0) { - err(33, "rdfs: seek error: %ld", (long)bno); - } - n = read(fsi, bf, size); - if (n != (ssize_t)size) { - err(34, "rdfs: read error: %ld", (long)bno); - } +#define DUMP_WHOLE_INODE(A,B) \ + ( disk.d_ufs == 1 \ + ? dump_whole_ufs1_inode((A),(B)) : dump_whole_ufs2_inode((A),(B)) ) - DBG_LEAVE; - return; -} - /* ************************************************************** main ***** */ /* * ffsinfo(8) is a tool to dump all metadata of a file system. It helps to find @@ -140,13 +122,10 @@ main(int argc, char **argv) { DBG_FUNC("main") - char *device, *special, *cp; + char *device, *special; char ch; size_t len; struct stat st; - struct disklabel *lp; - struct partition *pp; - int fsi; struct csum *dbg_csp; int dbg_csc; char dbg_line[80]; @@ -155,7 +134,6 @@ int cg_start, cg_stop; ino_t in; char *out_file; - int Lflag=0; DBG_ENTER; @@ -167,11 +145,8 @@ errx(1, "strdup failed"); } - while ((ch=getopt(argc, argv, "Lg:i:l:o:")) != -1) { + while ((ch=getopt(argc, argv, "g:i:l:o:")) != -1) { switch(ch) { - case 'L': - Lflag=1; - break; case 'g': cfg_cg=atol(optarg); if(cfg_cg < -1) { @@ -248,58 +223,9 @@ device = special; } - /* - * Open our device for reading. - */ - fsi = open(device, O_RDONLY); - if (fsi < 0) { - err(1, "%s", device); - } - - stat(device, &st); - - if(S_ISREG(st.st_mode)) { /* label check not supported for files */ - Lflag=1; - } - - if(!Lflag) { - /* - * Try to read a label and gess the slice if not specified. - * This code should guess the right thing and avaid to bother - * the user user with the task of specifying the option -v on - * vinum volumes. - */ - cp=device+strlen(device)-1; - lp = get_disklabel(fsi); - if(lp->d_type == DTYPE_VINUM) { - pp = &lp->d_partitions[0]; - } else if (isdigit(*cp)) { - pp = &lp->d_partitions[2]; - } else if (*cp>='a' && *cp<='h') { - pp = &lp->d_partitions[*cp - 'a']; - } else { - errx(1, "unknown device"); - } - - /* - * Check if that partition looks suited for dumping. - */ - if (pp->p_size < 1) { - errx(1, "partition is unavailable"); - } - if (pp->p_fstype != FS_BSDFFS) { - errx(1, "partition not 4.2BSD"); - } - } + if (ufs_disk_fillout(&disk, device) == -1) + err(1, "ufs_disk_fillout(%s) failed: %s", device, disk.d_error); - /* - * Read the current superblock. - */ - rdfs((daddr_t)(SBOFF/DEV_BSIZE), (size_t)SBSIZE, (void *)&sblock, fsi); - if (sblock.fs_magic != FS_MAGIC) { - errx(1, "superblock not recognized"); - } - DBG_OPEN(out_file); /* already here we need a superblock */ if(cfg_lv & 0x001) { @@ -335,10 +261,14 @@ * Get the cylinder summary into the memory ... */ for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize) { - rdfs(fsbtodb(&sblock, sblock.fs_csaddr + - numfrags(&sblock, i)), (size_t)(sblock.fs_cssize-i< - sblock.fs_bsize ? sblock.fs_cssize - i : - sblock.fs_bsize), (void *)(((char *)fscs)+i), fsi); + if (bread(&disk, + fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)), + (void *)(((char *)fscs)+i), + (size_t)(sblock.fs_cssize-i < sblock.fs_bsize + ? sblock.fs_cssize - i + : sblock.fs_bsize)) == -1) { + err(1, "bread: %s", disk.d_error); + } } dbg_csp=fscs; @@ -363,16 +293,20 @@ /* * ... dump the superblock copies ... */ - rdfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)), - (size_t)SBSIZE, (void *)&osblock, fsi); + if (bread(&disk, fsbtodb(&sblock, cgsblock(&sblock, cylno)), + (void *)&osblock, SBLOCKSIZE) == -1) { + err(1, "bread: %s", disk.d_error); + } DBG_DUMP_FS(&osblock, dbg_line); } /* * ... read the cylinder group and dump whatever was requested. */ - rdfs(fsbtodb(&sblock, cgtod(&sblock, cylno)), - (size_t)sblock.fs_cgsize, (void *)&acg, fsi); + if (bread(&disk, fsbtodb(&sblock, cgtod(&sblock, cylno)), + (void *)&acg, (size_t)sblock.fs_cgsize) == -1) { + err(1, "bread: %s", disk.d_error); + } if(cfg_lv & 0x008) { DBG_DUMP_CG(&sblock, dbg_line, @@ -396,45 +330,50 @@ dbg_line, &acg); } - if(cfg_lv & 0x080) { +#ifdef NOT_CURRENTLY + /* + * See the comment in sbin/growfs/debug.c for why this + * is currently disabled, and what needs to be done to + * re-enable it. + */ + if(disk.d_ufs == 1 && cfg_lv & 0x080) { DBG_DUMP_SPTBL(&sblock, dbg_line, &acg); } +#endif } /* * Dump the requested inode(s). */ if(cfg_in != -2) { - dump_whole_inode((ino_t)cfg_in, fsi, cfg_lv); + DUMP_WHOLE_INODE((ino_t)cfg_in, cfg_lv); } else { - for(in=cg_start*sblock.fs_ipg; in<(ino_t)cg_stop*sblock.fs_ipg; + for(in=cg_start*sblock.fs_ipg; in<(ino_t)cg_stop*sblock.fs_ipg; in++) { - dump_whole_inode(in, fsi, cfg_lv); + DUMP_WHOLE_INODE(in, cfg_lv); } } DBG_CLOSE; - close(fsi); - DBG_LEAVE; return 0; } -/* ************************************************** dump_whole_inode ***** */ +/* ********************************************** dump_whole_ufs1_inode ***** */ /* * Here we dump a list of all blocks allocated by this inode. We follow * all indirect blocks. */ void -dump_whole_inode(ino_t inode, int fsi, int level) +dump_whole_ufs1_inode(ino_t inode, int level) { - DBG_FUNC("dump_whole_inode") - struct dinode *ino; - int rb; + DBG_FUNC("dump_whole_ufs1_inode") + struct ufs1_dinode *ino; + int rb, mode; unsigned int ind2ctr, ind3ctr; - ufs_daddr_t *ind2ptr, *ind3ptr; + ufs1_daddr_t *ind2ptr, *ind3ptr; char comment[80]; DBG_ENTER; @@ -442,7 +381,8 @@ /* * Read the inode from disk/cache. */ - ino=ginode(inode, fsi); + if (getino(&disk, (void **)&ino, inode, &mode) == -1) + err(1, "getino: %s", disk.d_error); if(ino->di_nlink==0) { DBG_LEAVE; @@ -472,49 +412,57 @@ /* * Dump single indirect block. */ - rdfs(fsbtodb(&sblock, ino->di_ib[0]), (size_t)sblock.fs_bsize, - (void *)&i1blk, fsi); + if (bread(&disk, fsbtodb(&sblock, ino->di_ib[0]), (void *)&i1blk, + (size_t)sblock.fs_bsize) == -1) { + err(1, "bread: %s", disk.d_error); + } snprintf(comment, sizeof(comment), "Inode 0x%08x: indirect 0", inode); DBG_DUMP_IBLK(&sblock, comment, i1blk, (size_t)rb); - rb-=howmany(sblock.fs_bsize, sizeof(ufs_daddr_t)); + rb-=howmany(sblock.fs_bsize, sizeof(ufs1_daddr_t)); } if(rb>0) { /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 20:01:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D52C037B404; Fri, 15 Aug 2003 20:01:18 -0700 (PDT) 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 7AA3837B401 for ; Fri, 15 Aug 2003 20:01:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D43F43F85 for ; Fri, 15 Aug 2003 20:01:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7G31G0U016664 for ; Fri, 15 Aug 2003 20:01:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7G31F7t016661 for perforce@freebsd.org; Fri, 15 Aug 2003 20:01:15 -0700 (PDT) Date: Fri, 15 Aug 2003 20:01:15 -0700 (PDT) Message-Id: <200308160301.h7G31F7t016661@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 36240 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, 16 Aug 2003 03:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=36240 Change 36240 by marcel@marcel_nfs on 2003/08/15 20:00:57 IFC @36237 Affected files ... .. //depot/projects/uart/alpha/alpha/critical.c#3 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#6 integrate .. //depot/projects/uart/alpha/alpha/swtch.s#2 integrate .. //depot/projects/uart/alpha/include/critical.h#3 integrate .. //depot/projects/uart/amd64/amd64/critical.c#4 integrate .. //depot/projects/uart/amd64/include/critical.h#3 integrate .. //depot/projects/uart/conf/NOTES#8 integrate .. //depot/projects/uart/conf/files#14 integrate .. //depot/projects/uart/conf/files.i386#6 integrate .. //depot/projects/uart/conf/files.ia64#6 integrate .. //depot/projects/uart/conf/files.pc98#4 integrate .. //depot/projects/uart/conf/majors#2 integrate .. //depot/projects/uart/conf/options#8 integrate .. //depot/projects/uart/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/uart/ddb/db_access.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/uart/dev/ath/if_ath.c#6 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/uart/dev/bge/if_bge.c#6 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/uart/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/uart/dev/bktr/msp34xx.c#1 branch .. //depot/projects/uart/dev/ciss/ciss.c#4 integrate .. //depot/projects/uart/dev/dgb/dgb.c#2 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#7 integrate .. //depot/projects/uart/dev/mii/brgphy.c#3 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#7 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#7 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/uart/dev/puc/pucdata.c#4 integrate .. //depot/projects/uart/dev/safe/safe.c#2 integrate .. //depot/projects/uart/dev/sound/pci/csa.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/uart/dev/trm/trm.c#4 integrate .. //depot/projects/uart/dev/twe/twe.c#3 integrate .. //depot/projects/uart/dev/twe/twe_compat.h#3 integrate .. //depot/projects/uart/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/uart/dev/twe/twevar.h#3 integrate .. //depot/projects/uart/dev/tx/if_tx.c#3 integrate .. //depot/projects/uart/dev/usb/uvisor.c#4 integrate .. //depot/projects/uart/dev/vinum/vinumio.c#2 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/uart/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/uart/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/uart/geom/geom_dev.c#3 integrate .. //depot/projects/uart/geom/geom_io.c#2 integrate .. //depot/projects/uart/i386/conf/NOTES#3 integrate .. //depot/projects/uart/i386/conf/PAE#2 integrate .. //depot/projects/uart/i386/i386/critical.c#3 integrate .. //depot/projects/uart/i386/i386/exception.s#3 integrate .. //depot/projects/uart/i386/i386/identcpu.c#4 integrate .. //depot/projects/uart/i386/i386/initcpu.c#2 integrate .. //depot/projects/uart/i386/i386/mp_clock.c#2 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/uart/i386/i386/perfmon.c#2 integrate .. //depot/projects/uart/i386/i386/pmap.c#10 integrate .. //depot/projects/uart/i386/i386/support.s#2 integrate .. //depot/projects/uart/i386/i386/trap.c#3 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/uart/i386/include/apic.h#3 integrate .. //depot/projects/uart/i386/include/clock.h#3 integrate .. //depot/projects/uart/i386/include/critical.h#3 integrate .. //depot/projects/uart/i386/include/specialreg.h#2 integrate .. //depot/projects/uart/i386/isa/clock.c#3 integrate .. //depot/projects/uart/i386/isa/pcaudio.c#2 delete .. //depot/projects/uart/ia64/ia64/critical.c#3 integrate .. //depot/projects/uart/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#8 integrate .. //depot/projects/uart/ia64/ia64/ptrace_machdep.c#1 branch .. //depot/projects/uart/ia64/ia64/syscall.S#4 integrate .. //depot/projects/uart/ia64/ia64/trap.c#5 integrate .. //depot/projects/uart/ia64/include/critical.h#3 integrate .. //depot/projects/uart/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/uart/ia64/include/ptrace.h#2 integrate .. //depot/projects/uart/kern/kern_fork.c#3 integrate .. //depot/projects/uart/kern/kern_synch.c#3 integrate .. //depot/projects/uart/kern/kern_tc.c#3 integrate .. //depot/projects/uart/kern/kern_thr.c#3 integrate .. //depot/projects/uart/kern/kern_thread.c#8 integrate .. //depot/projects/uart/kern/sched_4bsd.c#2 integrate .. //depot/projects/uart/kern/subr_blist.c#2 integrate .. //depot/projects/uart/kern/subr_kobj.c#2 integrate .. //depot/projects/uart/kern/sys_pipe.c#6 integrate .. //depot/projects/uart/kern/sys_process.c#4 integrate .. //depot/projects/uart/libkern/arc4random.c#2 integrate .. //depot/projects/uart/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/uart/net80211/ieee80211.c#4 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#4 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#3 integrate .. //depot/projects/uart/netinet/if_atm.c#3 integrate .. //depot/projects/uart/netinet/tcp_input.c#3 integrate .. //depot/projects/uart/netinet/tcp_output.c#2 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#3 integrate .. //depot/projects/uart/netipsec/ipsec_input.c#2 integrate .. //depot/projects/uart/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/uart/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/uart/pc98/conf/NOTES#3 integrate .. //depot/projects/uart/pc98/pc98/pcaudio.c#2 delete .. //depot/projects/uart/pci/if_rl.c#9 integrate .. //depot/projects/uart/pci/if_rlreg.h#4 integrate .. //depot/projects/uart/powerpc/include/critical.h#3 integrate .. //depot/projects/uart/powerpc/powerpc/critical.c#3 integrate .. //depot/projects/uart/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/uart/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/uart/sparc64/include/critical.h#3 integrate .. //depot/projects/uart/sparc64/sparc64/critical.c#3 integrate .. //depot/projects/uart/sys/blist.h#2 integrate .. //depot/projects/uart/sys/pipe.h#4 integrate .. //depot/projects/uart/sys/proc.h#5 integrate .. //depot/projects/uart/sys/ptrace.h#2 integrate .. //depot/projects/uart/sys/queue.h#2 integrate .. //depot/projects/uart/sys/soundcard.h#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/uart/ufs/ufs/inode.h#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/uart/vm/swap_pager.c#8 integrate .. //depot/projects/uart/vm/vm_extern.h#2 integrate .. //depot/projects/uart/vm/vm_map.c#7 integrate .. //depot/projects/uart/vm/vm_map.h#4 integrate .. //depot/projects/uart/vm/vm_object.h#2 integrate .. //depot/projects/uart/vm/vm_pageout.c#5 integrate .. //depot/projects/uart/vm/vm_pageq.c#2 integrate .. //depot/projects/uart/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/critical.c#3 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 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. */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $"); #include #include ==== //depot/projects/uart/alpha/alpha/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.47 2003/08/12 19:33:35 jhb Exp $"); #include "opt_kstack_pages.h" @@ -208,7 +208,7 @@ /* ok, now grab sched_lock and enter the scheduler */ mtx_lock_spin(&sched_lock); - cpu_throw(); /* doesn't return */ + cpu_throw(NULL, choosethread()); /* doesn't return */ panic("scheduler returned us to %s", __func__); } ==== //depot/projects/uart/alpha/alpha/swtch.s#2 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.33 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.34 2003/08/12 19:33:35 jhb Exp $ */ #define _LOCORE @@ -49,7 +49,7 @@ /* * savectx: save process context, i.e. callee-saved registers * - * Note that savectx() only works for processes other than curthread, + * Note that savectx() only works for threads other than curthread, * since cpu_switch will copy over the info saved here. (It _can_ * sanely be used for curthread iff cpu_switch won't be called again, e.g. * from if called from boot().) @@ -88,58 +88,67 @@ /* * cpu_throw() - * Switch to a new task discarding our current state. + * Switch to a new thread discarding our current state. + * + * Arguments: + * a0 'struct thread *' of the old thread + * a1 'struct thread *' of the new thread */ LEAF(cpu_throw, 0) LDGP(pv) - mov zero, s0 /* ensure newproc != oldproc */ CALL(Lcs1) END(cpu_throw) /* * cpu_switch() - * Find the highest priority process and resume it. + * Switch to a new thread saving the current state in the old thread. + * + * Arguments: + * a0 'struct thread *' of the old thread + * a1 'struct thread *' of the new thread */ LEAF(cpu_switch, 1) LDGP(pv) /* do an inline savectx(), to save old context */ - ldq a0, PC_CURTHREAD(pcpup) - ldq a1, TD_PCB(a0) + ldq a2, TD_PCB(a0) /* NOTE: ksp is stored by the swpctx */ - stq s0, PCB_CONTEXT+(0 * 8)(a1) /* store s0 - s6 */ - stq s1, PCB_CONTEXT+(1 * 8)(a1) - stq s2, PCB_CONTEXT+(2 * 8)(a1) - stq s3, PCB_CONTEXT+(3 * 8)(a1) - stq s4, PCB_CONTEXT+(4 * 8)(a1) - stq s5, PCB_CONTEXT+(5 * 8)(a1) - stq s6, PCB_CONTEXT+(6 * 8)(a1) - stq ra, PCB_CONTEXT+(7 * 8)(a1) /* store ra */ + stq s0, PCB_CONTEXT+(0 * 8)(a2) /* store s0 - s6 */ + stq s1, PCB_CONTEXT+(1 * 8)(a2) + stq s2, PCB_CONTEXT+(2 * 8)(a2) + stq s3, PCB_CONTEXT+(3 * 8)(a2) + stq s4, PCB_CONTEXT+(4 * 8)(a2) + stq s5, PCB_CONTEXT+(5 * 8)(a2) + stq s6, PCB_CONTEXT+(6 * 8)(a2) + stq ra, PCB_CONTEXT+(7 * 8)(a2) /* store ra */ call_pal PAL_OSF1_rdps /* NOTE: doesn't kill a0 */ - stq v0, PCB_CONTEXT+(8 * 8)(a1) /* store ps, for ipl */ + stq v0, PCB_CONTEXT+(8 * 8)(a2) /* store ps, for ipl */ mov a0, s0 /* s0 = old curthread */ - mov a1, s1 /* s1 = old pcb */ + mov a2, s1 /* s1 = old pcb */ + + /* + * Deactivate the old address space before activating the + * new one. We need to do this before activating the + * new thread's address space in the event that new + * thread is using the same vmspace as the old. If we + * do this after we activate, then we might end up + * incorrectly marking the pmap inactive! + * + * We don't deactivate if we came here from switch_exit + * (old pmap no longer exists; vmspace has been freed). + * oldproc will be NULL in this case. We have actually + * taken care of calling pmap_deactivate() in cpu_exit(), + * before the vmspace went away. + */ + beq a0, sw1 + CALL(pmap_deactivate) /* pmap_deactivate(oldthread) */ sw1: br pv, Lcs1 Lcs1: LDGP(pv) - CALL(choosethread) /* can't return NULL */ - mov v0, s2 /* s2 = new thread */ + mov a1, s2 /* s2 = new thread */ ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ - /* - * Check to see if we're switching to ourself. If we are, - * don't bother loading the new context. - * - * Note that even if we re-enter cpu_switch() from idle(), - * s0 will still contain the old curthread value because any - * users of that register between then and now must have - * saved it. Also note that switch_exit() ensures that - * s0 is clear before jumping here to find a new process. - */ - cmpeq s0, s2, t0 /* oldthread == newthread? */ - bne t0, Lcs7 /* Yes! Skip! */ - #ifdef SMP /* * Save fp state if we have some. @@ -150,27 +159,7 @@ #endif /* - * Deactivate the old address space before activating the - * new one. We need to do this before activating the - * new process's address space in the event that new - * process is using the same vmspace as the old. If we - * do this after we activate, then we might end up - * incorrectly marking the pmap inactive! - * - * We don't deactivate if we came here from switch_exit - * (old pmap no longer exists; vmspace has been freed). - * oldproc will be NULL in this case. We have actually - * taken care of calling pmap_deactivate() in cpu_exit(), - * before the vmspace went away. - */ - beq s0, Lcs6 - - mov s0, a0 /* pmap_deactivate(oldthread) */ - CALL(pmap_deactivate) /* XXXKSE */ - -Lcs6: - /* - * Activate the new process's address space and perform + * Activate the new thread's address space and perform * the actual context swap. */ @@ -180,18 +169,14 @@ mov s3, a0 /* swap the context */ SWITCH_CONTEXT -Lcs7: - /* * Now that the switch is done, update curthread and other - * globals. We must do this even if switching to ourselves - * because we might have re-entered cpu_switch() from idle(), - * in which case curthread would be NULL. + * globals. */ stq s2, PC_CURTHREAD(pcpup) /* curthread = p */ /* - * Now running on the new u struct. + * Now running on the new pcb. * Restore registers and return. */ ldq t0, TD_PCB(s2) ==== //depot/projects/uart/alpha/include/critical.h#3 (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: @@ -11,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.2 2003/08/04 20:32:44 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.3 2003/08/12 23:24:03 imp Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/uart/amd64/amd64/critical.c#4 (text+ko) ==== @@ -1,10 +1,32 @@ /*- - * Copyright (c) 2001 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. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.11 2003/08/04 20:32:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $"); #include #include ==== //depot/projects/uart/amd64/include/critical.h#3 (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: @@ -11,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.4 2003/08/04 20:32:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/uart/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1168 2003/08/11 08:40:01 harti Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1169 2003/08/12 09:45:33 alex Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1917,6 +1917,10 @@ # motherboards and motherboards with bad or incomplete PCI 2.1 support. # As a rough guess, old = before 1998 # +# options BKTR_NEW_MSP34XX_DRIVER +# Use new, more complete initialization scheme for the msp34* soundchip. +# Should fix stereo autodetection if the old driver does only output +# mono sound. device meteor 1 ==== //depot/projects/uart/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.813 2003/08/11 08:40:01 harti Exp $ +# $FreeBSD: src/sys/conf/files,v 1.814 2003/08/12 09:45:33 alex Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -335,6 +335,7 @@ dev/bktr/bktr_i2c.c optional bktr pci smbus dev/bktr/bktr_os.c optional bktr pci dev/bktr/bktr_tuner.c optional bktr pci +dev/bktr/msp34xx.c optional bktr pci dev/buslogic/bt.c optional bt dev/buslogic/bt_eisa.c optional bt eisa dev/buslogic/bt_isa.c optional bt isa ==== //depot/projects/uart/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.450 2003/08/04 02:39:14 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.451 2003/08/15 14:56:05 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,7 +255,6 @@ i386/isa/loran.c optional loran i386/isa/mse.c optional mse i386/isa/npx.c optional npx -i386/isa/pcaudio.c optional pca i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt ==== //depot/projects/uart/conf/files.ia64#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.ia64,v 1.55 2003/08/01 05:28:43 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.56 2003/08/15 18:01:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -98,6 +98,7 @@ ia64/ia64/nexus.c standard ia64/ia64/pal.S standard ia64/ia64/pmap.c standard +ia64/ia64/ptrace_machdep.c standard ia64/ia64/sal.c standard ia64/ia64/sapic.c standard ia64/ia64/setjmp.S standard ==== //depot/projects/uart/conf/files.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.274 2003/08/02 09:23:03 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.275 2003/08/15 14:56:05 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -347,7 +347,6 @@ pc98/pc98/pc98gdc.c optional gdc pc98/pc98/pc98kbd.c optional pckbd pc98/pc98/pc98_machdep.c standard -pc98/pc98/pcaudio.c optional pca pc98/pc98/pmc.c optional pmc pc98/pc98/ppc.c optional ppc pc98/pc98/scgdcrndr.c optional sc gdc ==== //depot/projects/uart/conf/majors#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.175 2003/06/11 18:34:50 tmm Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.176 2003/08/15 14:56:05 phk Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -37,7 +37,6 @@ 21 *psm PS/2 Mouse 22 *fd (/dev/stdin etc) 23 *bpf Berkeley Packet Filter -24 *pca PC speaker (/dev/pcaudio) 26 *spkr PC speaker (/dev/spkr) 27 *mse Microsoft bus-mouse 28 *sio 16450/16550 serial ==== //depot/projects/uart/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.409 2003/08/11 08:40:01 harti Exp $ +# $FreeBSD: src/sys/conf/options,v 1.410 2003/08/12 09:45:34 alex Exp $ # # On the handling of kernel options # @@ -523,6 +523,7 @@ BKTR_430_FX_MODE opt_bktr.h BKTR_SIS_VIA_MODE opt_bktr.h BKTR_USE_FREEBSD_SMBUS opt_bktr.h +BKTR_NEW_MSP34XX_DRIVER opt_bktr.h # meteor opt_meteor.h METEOR_ALLOC_PAGES opt_meteor.h ==== //depot/projects/uart/contrib/dev/acpica/osunixxf.c#2 (text+ko) ==== @@ -478,7 +478,7 @@ void AcpiOsUnmapMemory ( void *where, - UINT32 length) + ACPI_SIZE length) { return; @@ -499,7 +499,7 @@ void * AcpiOsAllocate ( - UINT32 size) + ACPI_SIZE size) { void *Mem; ==== //depot/projects/uart/ddb/db_access.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_access.c,v 1.16 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_access.c,v 1.17 2003/08/12 13:24:21 harti Exp $"); #include @@ -54,7 +54,7 @@ register int size; boolean_t is_signed; { - char data[sizeof(int)]; + char data[sizeof(u_int64_t)]; register db_expr_t value; register int i; ==== //depot/projects/uart/dev/acpica/acpi.c#6 (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.94 2003/08/08 03:19:22 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.95 2003/08/15 02:10:38 njl Exp $ */ #include "opt_acpi.h" @@ -962,6 +962,8 @@ /* Enable and clear fixed events and install handlers. */ if ((AcpiGbl_FADT != NULL) && (AcpiGbl_FADT->PwrButton == 0)) { + AcpiEnableEvent(ACPI_EVENT_POWER_BUTTON, 0); + AcpiClearEvent(ACPI_EVENT_POWER_BUTTON); AcpiInstallFixedEventHandler(ACPI_EVENT_POWER_BUTTON, acpi_eventhandler_power_button_for_sleep, sc); if (first_time) { @@ -969,6 +971,8 @@ } } if ((AcpiGbl_FADT != NULL) && (AcpiGbl_FADT->SleepButton == 0)) { + AcpiEnableEvent(ACPI_EVENT_SLEEP_BUTTON, 0); + AcpiClearEvent(ACPI_EVENT_SLEEP_BUTTON); AcpiInstallFixedEventHandler(ACPI_EVENT_SLEEP_BUTTON, acpi_eventhandler_sleep_button_for_sleep, sc); if (first_time) { @@ -1405,7 +1409,9 @@ acpi_sleep_machdep(sc, state); /* AcpiEnterSleepState() maybe incompleted, unlock here if locked. */ - if (1/*AcpiGbl_AcpiMutexInfo[ACPI_MTX_HARDWARE].OwnerId != ACPI_MUTEX_NOT_ACQUIRED*/) { + if (AcpiGbl_MutexInfo[ACPI_MTX_HARDWARE].OwnerId != + ACPI_MUTEX_NOT_ACQUIRED) { + AcpiUtReleaseMutex(ACPI_MTX_HARDWARE); } ==== //depot/projects/uart/dev/acpica/acpi_acad.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.15 2003/08/11 15:34:43 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.17 2003/08/15 06:33:11 njl Exp $ */ #include "opt_acpi.h" @@ -151,15 +151,10 @@ ACPI_HANDLE handle; int error; + sc = device_get_softc(dev); + if (sc == NULL) + return (ENXIO); handle = acpi_get_handle(dev); - AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY, - acpi_acad_notify_handler, dev); - /* XXX Installing system notify is not so good */ - AcpiInstallNotifyHandler(handle, ACPI_SYSTEM_NOTIFY, - acpi_acad_notify_handler, dev); - - if ((sc = device_get_softc(dev)) == NULL) - return (ENXIO); error = acpi_register_ioctl(ACPIIO_ACAD_GET_STATUS, acpi_acad_ioctl, dev); if (error != 0) @@ -177,6 +172,14 @@ sc->status = -1; sc->initializing = 0; + /* + * Also install a system notify handler even though this is not + * required by the specification. The Casio FIVA needs this. + */ + AcpiInstallNotifyHandler(handle, ACPI_SYSTEM_NOTIFY, + acpi_acad_notify_handler, dev); + AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY, + acpi_acad_notify_handler, dev); AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_acad_init_acline, dev); return (0); @@ -189,8 +192,9 @@ device_t dev; dev = (device_t)arg; - if ((sc = device_get_softc(dev)) == NULL) - return(ENXIO); + sc = device_get_softc(dev); + if (sc == NULL) + return (ENXIO); /* * No security check required: information retrieval only. If @@ -238,15 +242,16 @@ "acline initialization start\n"); status = 0; - for (retry = 0; retry < ACPI_ACAD_RETRY_MAX; retry++, AcpiOsSleep(10, 0)) { + for (retry = 0; retry < ACPI_ACAD_RETRY_MAX; retry++) { acpi_acad_get_status(dev); if (status != sc->status) break; + AcpiOsSleep(10, 0); } sc->initializing = 0; ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "acline initialization done, tried %d times\n", retry+1); + "acline initialization done, tried %d times\n", retry + 1); } /* ==== //depot/projects/uart/dev/acpica/acpi_cmbat.c#3 (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/acpica/acpi_cmbat.c,v 1.21 2003/08/11 15:34:43 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.22 2003/08/15 02:18:15 njl Exp $ */ #include "opt_acpi.h" @@ -132,7 +132,25 @@ static int acpi_cmbat_get_total_battinfo(struct acpi_battinfo *); static void acpi_cmbat_init_battery(void *); -static __inline int +static device_method_t acpi_cmbat_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, acpi_cmbat_probe), + DEVMETHOD(device_attach, acpi_cmbat_attach), + DEVMETHOD(device_resume, acpi_cmbat_resume), + + {0, 0} +}; + +static driver_t acpi_cmbat_driver = { + "acpi_cmbat", + acpi_cmbat_methods, + sizeof(struct acpi_cmbat_softc), +}; + +static devclass_t acpi_cmbat_devclass; +DRIVER_MODULE(acpi_cmbat, acpi, acpi_cmbat_driver, acpi_cmbat_devclass, 0, 0); + +static int acpi_cmbat_info_expired(struct timespec *lastupdated) { struct timespec curtime; @@ -149,7 +167,7 @@ } -static __inline void +static void acpi_cmbat_info_updated(struct timespec *lastupdated) { if (lastupdated != NULL) @@ -352,24 +370,6 @@ return (0); } -static device_method_t acpi_cmbat_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, acpi_cmbat_probe), - DEVMETHOD(device_attach, acpi_cmbat_attach), - DEVMETHOD(device_resume, acpi_cmbat_resume), - - {0, 0} -}; - -static driver_t acpi_cmbat_driver = { - "acpi_cmbat", - acpi_cmbat_methods, - sizeof(struct acpi_cmbat_softc), -}; - -static devclass_t acpi_cmbat_devclass; -DRIVER_MODULE(acpi_cmbat, acpi, acpi_cmbat_driver, acpi_cmbat_devclass, 0, 0); - static int acpi_cmbat_ioctl(u_long cmd, caddr_t addr, void *arg) { @@ -428,7 +428,7 @@ return (0); } -static __inline int +static int acpi_cmbat_is_bst_valid(struct acpi_bst *bst) { if (bst->state >= ACPI_BATT_STAT_MAX || bst->cap == 0xffffffff || @@ -439,7 +439,7 @@ return (1); } -static __inline int +static int acpi_cmbat_is_bif_valid(struct acpi_bif *bif) { if (bif->lfcap == 0) @@ -617,6 +617,7 @@ break; } + sc->initializing = 0; if (retry == ACPI_CMBAT_RETRY_MAX) { ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "battery initialization failed, giving up\n"); @@ -624,7 +625,6 @@ ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "battery initialization done, tried %d times\n", retry + 1); } - sc->initializing = 0; } /* ==== //depot/projects/uart/dev/ath/if_ath.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.5 2003/08/02 06:14:15 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.6 2003/08/13 21:29:35 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -199,6 +199,7 @@ goto bad; } sc->sc_ah = ah; + sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ /* * Collect the channel list using the default country @@ -372,8 +373,8 @@ if (sc->sc_invalid) { /* - * The hardware is gone, don't touch anything. - * XXX can this happen? + * The hardware is not ready/present, don't touch anything. + * Note this can happen early on if the IRQ is shared. */ DPRINTF(("ath_intr: invalid; ignored\n")); return; ==== //depot/projects/uart/dev/ath/if_ath_pci.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.2 2003/07/01 15:51:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.3 2003/08/13 21:29:35 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -152,6 +152,11 @@ } sc->sc_st = rman_get_bustag(psc->sc_sr); sc->sc_sh = rman_get_bushandle(psc->sc_sr); + /* + * Mark device invalid so any interrupts (shared or otherwise) + * that arrive before the HAL is setup are discarded. + */ + sc->sc_invalid = 1; /* * Arrange interrupt line. ==== //depot/projects/uart/dev/bge/if_bge.c#6 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.49 2003/08/10 18:04:35 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.50 2003/08/12 05:18:51 wpaul Exp $"); #include #include @@ -154,6 +154,10 @@ "Broadcom BCM5705M Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5782, "Broadcom BCM5782 Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5901, + "Broadcom BCM5901 Fast Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5901A2, + "Broadcom BCM5901A2 Fast Ethernet" }, { SK_VENDORID, SK_DEVICEID_ALTIMA, "SysKonnect Gigabit Ethernet" }, { ALTIMA_VENDORID, ALTIMA_DEVICE_AC1000, ==== //depot/projects/uart/dev/bge/if_bgereg.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.20 2003/07/25 20:33:43 wpaul Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.21 2003/08/12 05:18:51 wpaul Exp $ */ /* @@ -1822,6 +1822,8 @@ #define BCOM_DEVICEID_BCM5705M 0x165D #define BCOM_DEVICEID_BCM5705M_ALT 0x165E #define BCOM_DEVICEID_BCM5782 0x1696 +#define BCOM_DEVICEID_BCM5901 0x170D +#define BCOM_DEVICEID_BCM5901A2 0x170E /* * Alteon AceNIC PCI vendor/device ID. ==== //depot/projects/uart/dev/bktr/bktr_audio.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.9 2003/02/02 17:46:00 orion Exp $ */ +/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.10 2003/08/12 09:45:34 alex Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 09:42:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0665037B404; Sat, 16 Aug 2003 09:42:45 -0700 (PDT) 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 97EEF37B401; Sat, 16 Aug 2003 09:42:44 -0700 (PDT) Received: from milla.ask33.net (milla.ask33.net [217.197.166.60]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3AF943F85; Sat, 16 Aug 2003 09:42:43 -0700 (PDT) (envelope-from nick@milla.ask33.net) Received: by milla.ask33.net (Postfix, from userid 1001) id BFD003ABB3F; Sat, 16 Aug 2003 18:43:00 +0200 (CEST) Date: Sat, 16 Aug 2003 18:43:00 +0200 From: Pawel Jakub Dawidek To: Robert Watson Message-ID: <20030816164300.GS395@garage.freebsd.pl> References: <200308062120.h76LKi3d003275@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="B2XwZuBUJ8PPSpsy" Content-Disposition: inline In-Reply-To: <200308062120.h76LKi3d003275@repoman.freebsd.org> X-PGP-Key-URL: http://garage.freebsd.pl/jules.asc X-OS: FreeBSD 4.8-RELEASE-p3 i386 X-URL: http://garage.freebsd.pl User-Agent: Mutt/1.5.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 35655 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, 16 Aug 2003 16:42:46 -0000 --B2XwZuBUJ8PPSpsy Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 06, 2003 at 02:20:44PM -0700, Robert Watson wrote: +> - mode ~=3D cmask; +> + mode =3D mode &~ cmask; IMHO this is a style bug. This should be: mode =3D mode & ~cmask; On time, when I was tired, I've spend few minutes wondering why 'foo' after this operation isn't equal to 'foo - bar':) foo =3D- bar; --=20 Pawel Jakub Dawidek pawel@dawidek.net UNIX Systems Programmer/Administrator http://garage.freebsd.pl Am I Evil? Yes, I Am! http://cerber.sourceforge.net --B2XwZuBUJ8PPSpsy Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iQCVAwUBPz5fFD/PhmMH/Mf1AQFIugP8DHWvRG0vWdFoQL2v5McFuxTZmvFgcxqo UmwdJvh/kQaAUXFyaXZmXSzjpRFkdl3EVSCVhhBmXS82kdjqM6nqotpdMes1K5E3 3BpZAchUhFb0xAzRsS7mSHlbftFIF7a+KKAZE8rpqmrD5kqREK9PxB4noQC8vc/9 /uEp4NZEVAw= =Fse2 -----END PGP SIGNATURE----- --B2XwZuBUJ8PPSpsy-- From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:57:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 766DE37B404; Sat, 16 Aug 2003 14:57:41 -0700 (PDT) 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 1449C37B401 for ; Sat, 16 Aug 2003 14:57:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E08743FA3 for ; Sat, 16 Aug 2003 14:57:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7GLvc0U008350 for ; Sat, 16 Aug 2003 14:57:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7GLvb47008347 for perforce@freebsd.org; Sat, 16 Aug 2003 14:57:37 -0700 (PDT) Date: Sat, 16 Aug 2003 14:57:37 -0700 (PDT) Message-Id: <200308162157.h7GLvb47008347@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 36270 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, 16 Aug 2003 21:57:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=36270 Change 36270 by marcel@marcel_nfs on 2003/08/16 14:56:53 Build uart(4) as a module. We still need the linker glue, but this so far works. Affected files ... .. //depot/projects/uart/conf/kmod.mk#4 edit .. //depot/projects/uart/modules/uart/Makefile#1 add Differences ... ==== //depot/projects/uart/conf/kmod.mk#4 (text+ko) ==== @@ -257,7 +257,7 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m \ - opencrypto/crypto_if.m pc98/pc98/canbus_if.m + opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m .for _srcsrc in ${MFILES} .for _ext in c h From owner-p4-projects@FreeBSD.ORG Sat Aug 16 15:23:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6120A37B404; Sat, 16 Aug 2003 15:23:10 -0700 (PDT) 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 14E9537B401 for ; Sat, 16 Aug 2003 15:23:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93DF143FB1 for ; Sat, 16 Aug 2003 15:23:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7GMN90U010117 for ; Sat, 16 Aug 2003 15:23:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7GMN9Kn010114 for perforce@freebsd.org; Sat, 16 Aug 2003 15:23:09 -0700 (PDT) Date: Sat, 16 Aug 2003 15:23:09 -0700 (PDT) Message-Id: <200308162223.h7GMN9Kn010114@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 36271 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, 16 Aug 2003 22:23:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=36271 Change 36271 by marcel@marcel_nfs on 2003/08/16 15:22:47 TIOCM_LE is always enabled when the device is opened. Copied from sio(4). Don't think I know what I'm doing :-) Affected files ... .. //depot/projects/uart/dev/uart/uart_core.c#16 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_core.c#16 (text+ko) ==== @@ -697,7 +697,7 @@ break; case TIOCMGET: sig = UART_GETSIG(sc); - bits = 0; + bits = TIOCM_LE; if (sig & UART_SIG_DTR) bits |= TIOCM_DTR; if (sig & UART_SIG_RTS) From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:20:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5C337B404; Sat, 16 Aug 2003 16:20:21 -0700 (PDT) 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 011BD37B401 for ; Sat, 16 Aug 2003 16:20:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E20B43F85 for ; Sat, 16 Aug 2003 16:20:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7GNKK0U013360 for ; Sat, 16 Aug 2003 16:20:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7GNKJuB013354 for perforce@freebsd.org; Sat, 16 Aug 2003 16:20:19 -0700 (PDT) Date: Sat, 16 Aug 2003 16:20:19 -0700 (PDT) Message-Id: <200308162320.h7GNKJuB013354@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 36274 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, 16 Aug 2003 23:20:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=36274 Change 36274 by marcel@marcel_nfs on 2003/08/16 16:19:28 We also need to compile uart_if.c of course. Affected files ... .. //depot/projects/uart/modules/uart/Makefile#2 edit Differences ... ==== //depot/projects/uart/modules/uart/Makefile#2 (text+ko) ==== @@ -5,7 +5,8 @@ KMOD= uart SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \ uart_bus_puc.c uart_cons.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \ - uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_subr.c + uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \ + uart_subr.c SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h .include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:53:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2F5837B404; Sat, 16 Aug 2003 22:53:20 -0700 (PDT) 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 7E02137B401 for ; Sat, 16 Aug 2003 22:53:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B8E643FBD for ; Sat, 16 Aug 2003 22:53:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7H5rJ0U044318 for ; Sat, 16 Aug 2003 22:53:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7H5rJGd044315 for perforce@freebsd.org; Sat, 16 Aug 2003 22:53:19 -0700 (PDT) Date: Sat, 16 Aug 2003 22:53:19 -0700 (PDT) Message-Id: <200308170553.h7H5rJGd044315@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 36280 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, 17 Aug 2003 05:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=36280 Change 36280 by marcel@marcel_nfs on 2003/08/16 22:52:50 Fix cut-n-paste bug. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#15 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#15 (text+ko) ==== @@ -634,8 +634,8 @@ UART_SIG_DDTR); } if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_DTR, ns8250->signals, UART_SIG_DTR, - UART_SIG_DDTR); + SIGCHG(sig & UART_SIG_RTS, ns8250->signals, UART_SIG_RTS, + UART_SIG_DRTS); } ns8250->mcr &= ~(MCR_DTR|MCR_RTS); if (ns8250->signals & UART_SIG_DTR) From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:54:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3534237B404; Sat, 16 Aug 2003 22:54:23 -0700 (PDT) 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 CA36537B401 for ; Sat, 16 Aug 2003 22:54:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5897443F3F for ; Sat, 16 Aug 2003 22:54:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7H5sM0U044346 for ; Sat, 16 Aug 2003 22:54:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7H5sLg4044343 for perforce@freebsd.org; Sat, 16 Aug 2003 22:54:21 -0700 (PDT) Date: Sat, 16 Aug 2003 22:54:21 -0700 (PDT) Message-Id: <200308170554.h7H5sLg4044343@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 36282 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, 17 Aug 2003 05:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=36282 Change 36282 by marcel@marcel_nfs on 2003/08/16 22:54:08 Call ttychars() on open. Affected files ... .. //depot/projects/uart/dev/uart/uart_core.c#17 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_core.c#17 (text+ko) ==== @@ -584,6 +584,7 @@ tp->t_ispeed = tp->t_ospeed = uart_console.baudrate; } else tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttychars(tp); error = uart_tty_param(tp, &tp->t_termios); if (error) return (error);