Date: Tue, 4 Jun 2002 07:21:55 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 12354 for review Message-ID: <200206041421.g54ELtE30271@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12354 Change 12354 by jhb@jhb_laptop on 2002/06/04 07:20:54 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#5 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#6 integrate ... //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#4 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#9 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#3 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_file.c#10 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#14 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ipc.c#8 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#23 integrate ... //depot/projects/smpng/sys/compat/linux/linux_signal.c#5 integrate ... //depot/projects/smpng/sys/compat/linux/linux_socket.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/smpng/sys/compat/linux/linux_stats.c#6 integrate ... //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#7 integrate ... //depot/projects/smpng/sys/conf/NOTES#14 integrate ... //depot/projects/smpng/sys/conf/files#41 integrate ... //depot/projects/smpng/sys/conf/files.i386#24 integrate ... //depot/projects/smpng/sys/conf/files.pc98#24 integrate ... //depot/projects/smpng/sys/conf/options#27 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#8 integrate ... //depot/projects/smpng/sys/dev/awi/awivar.h#3 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#6 integrate ... //depot/projects/smpng/sys/dev/ct/ct_machdep.h#4 integrate ... //depot/projects/smpng/sys/dev/drm/drm_dma.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#3 integrate ... //depot/projects/smpng/sys/dev/drm/drm_scatter.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/gamma_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_dma.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_state.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_cce.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_state.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_cp.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_state.c#2 integrate ... //depot/projects/smpng/sys/dev/em/README#1 branch ... //depot/projects/smpng/sys/dev/em/if_em.c#8 integrate ... //depot/projects/smpng/sys/dev/em/if_em.h#5 integrate ... //depot/projects/smpng/sys/dev/em/if_em_hw.c#1 branch ... //depot/projects/smpng/sys/dev/em/if_em_hw.h#1 branch ... //depot/projects/smpng/sys/dev/em/if_em_osdep.h#4 integrate ... //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#4 integrate ... //depot/projects/smpng/sys/dev/exca/exca.c#3 integrate ... //depot/projects/smpng/sys/dev/hea/eni.c#4 integrate ... //depot/projects/smpng/sys/dev/hea/eni.h#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_buffer.c#5 integrate ... //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/smpng/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/smpng/sys/dev/joy/joy.c#4 integrate ... //depot/projects/smpng/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/smpng/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc.c#4 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/smpng/sys/dev/md/md.c#21 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#5 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500var.h#5 integrate ... //depot/projects/smpng/sys/dev/nsp/nspvar.h#5 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#12 integrate ... //depot/projects/smpng/sys/dev/pci/pcivar.h#5 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fea.c#4 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fpa.c#3 integrate ... //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#2 integrate ... //depot/projects/smpng/sys/dev/pdq/pdqvar.h#3 integrate ... //depot/projects/smpng/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30var.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/urio.c#9 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.c#7 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#16 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#14 integrate ... //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#9 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#4 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#8 integrate ... //depot/projects/smpng/sys/i386/include/asmacros.h#3 integrate ... //depot/projects/smpng/sys/i386/include/floatingpoint.h#2 integrate ... //depot/projects/smpng/sys/i386/include/if_wl_wavelan.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/ic/lemac.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/if_le.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/scd.c#5 integrate ... //depot/projects/smpng/sys/i386/linux/imgact_linux.c#4 integrate ... //depot/projects/smpng/sys/i386/linux/linux_dummy.c#7 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#18 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#10 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#6 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.h#2 integrate ... //depot/projects/smpng/sys/kern/imgact_elf.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#41 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#39 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#15 integrate ... //depot/projects/smpng/sys/kern/sys_socket.c#8 integrate ... //depot/projects/smpng/sys/kern/tty.c#23 integrate ... //depot/projects/smpng/sys/kern/uipc_domain.c#5 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf.c#6 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#23 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#16 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#19 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#20 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#25 integrate ... //depot/projects/smpng/sys/modules/Makefile#29 integrate ... //depot/projects/smpng/sys/modules/em/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/hea/Makefile#1 branch ... //depot/projects/smpng/sys/net/raw_cb.c#4 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#9 integrate ... //depot/projects/smpng/sys/net/route.c#6 integrate ... //depot/projects/smpng/sys/net/rtsock.c#19 integrate ... //depot/projects/smpng/sys/netatalk/ddp_input.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#11 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_async.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_async.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#9 integrate ... //depot/projects/smpng/sys/netgraph/ng_bpf.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_bpf.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_bridge.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_bridge.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_cisco.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_cisco.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_eiface.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_eiface.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_etf.c#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_etf.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_iface.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_ksocket.c#13 integrate ... //depot/projects/smpng/sys/netgraph/ng_ksocket.h#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_message.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_one2many.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_one2many.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_parse.c#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_parse.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_ppp.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_ppp.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.c#8 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.h#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_sample.c#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_sample.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#13 integrate ... //depot/projects/smpng/sys/netgraph/ng_tee.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_tee.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_vjc.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_vjc.h#2 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#5 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#5 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#25 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#16 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#20 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#13 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#19 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#19 integrate ... //depot/projects/smpng/sys/netinet/tcp_output.c#8 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#20 integrate ... //depot/projects/smpng/sys/netinet/tcp_timer.c#5 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#12 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#21 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#8 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#15 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#9 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#8 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#12 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#14 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#8 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#9 integrate ... //depot/projects/smpng/sys/netipx/spx_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#9 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#7 integrate ... //depot/projects/smpng/sys/netncp/ncp_sock.c#3 integrate ... //depot/projects/smpng/sys/netns/idp_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netns/ns.c#3 integrate ... //depot/projects/smpng/sys/netns/ns_pcb.c#4 integrate ... //depot/projects/smpng/sys/netns/spp_usrreq.c#3 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#10 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#12 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_socket.c#10 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/pmc.c#4 integrate ... //depot/projects/smpng/sys/pci/dc21040reg.h#2 integrate ... //depot/projects/smpng/sys/pci/if_de.c#3 integrate ... //depot/projects/smpng/sys/pci/if_devar.h#3 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_interface.c#4 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_log.c#5 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_socket.c#10 integrate ... //depot/projects/smpng/sys/sys/gpt.h#2 integrate ... //depot/projects/smpng/sys/sys/imgact_elf.h#4 integrate ... //depot/projects/smpng/sys/sys/joystick.h#2 integrate ... //depot/projects/smpng/sys/sys/mbuf.h#8 integrate ... //depot/projects/smpng/sys/sys/param.h#25 integrate ... //depot/projects/smpng/sys/sys/proc.h#50 integrate ... //depot/projects/smpng/sys/sys/socket.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#21 integrate ... //depot/projects/smpng/sys/sys/vmmeter.h#2 integrate ... //depot/projects/smpng/sys/sys/wait.h#4 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#25 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#6 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#16 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#10 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#6 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.34 2001/10/16 06:15:35 marcel Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.35 2002/06/02 20:05:40 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.81 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.10 2002/02/07 22:29:41 peter Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ */ #include <sys/types.h> ==== //depot/projects/smpng/sys/alpha/osf1/osf1.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.4 2000/11/09 08:25:45 marcel Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.5 2002/06/02 20:05:41 schweikh Exp $ */ extern struct sysent osf1_sysent[]; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#9 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -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/sys/alpha/osf1/osf1_sysvec.c,v 1.6 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.4 2002/06/02 20:05:41 schweikh Exp $ */ #include <vm/vm.h> ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#10 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.63 2002/02/27 18:31:36 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.64 2002/06/02 20:05:41 schweikh Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#14 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.84 2002/02/20 17:06:37 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.85 2002/06/02 20:05:41 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#8 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.29 2002/05/18 07:53:56 marcel Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.30 2002/06/02 20:05:42 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#23 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.122 2002/06/02 20:05:42 schweikh Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_signal.c#5 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.33 2002/04/04 17:49:45 bde Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.34 2002/06/02 20:05:42 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/linux/linux_socket.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.31 2001/11/17 18:43:13 dillon Exp $ + * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.32 2002/06/02 20:05:42 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/compat/linux/linux_socket.h#2 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.1 2000/12/19 00:24:25 assar Exp $ + * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $ */ #ifndef _LINUX_SOCKET_H_ ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.40 2002/01/14 00:13:42 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.41 2002/06/02 20:05:42 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#5 (text+ko) ==== @@ -16,7 +16,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * 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 @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.14 2002/03/20 05:41:37 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.14 2002/05/20 05:41:03 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.15 2002/05/31 11:52:29 tanimura Exp $ */ #include <sys/param.h> @@ -116,17 +116,15 @@ if (fp->f_type == DTYPE_SOCKET) { so = (struct socket *)fp->f_data; - SOCK_LOCK(so); + DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); + if (so->so_state & SS_ASYNC) { + DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); + } + DPRINTF(("Here are its flags: 0x%x\n", so->so_state)); +#if defined(GROTTY_READ_HACK) so_state = so->so_state; -#if defined(GROTTY_READ_HACK) so->so_state &= ~SS_NBIO; #endif - SOCK_UNLOCK(so); - DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); - if (so_state & SS_ASYNC) { - DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); - } - DPRINTF(("Here are its flags: 0x%x\n", so_state)); } rv = read(td, &ra); @@ -142,9 +140,7 @@ #if defined(GROTTY_READ_HACK) if (so) { /* We've already checked to see if this is a socket */ - SOCK_LOCK(so); so->so_state = so_state; - SOCK_UNLOCK(so); } #endif fdrop(fp, td); ==== //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#7 (text+ko) ==== @@ -25,16 +25,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.13 2002/05/20 05:41:03 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.14 2002/05/31 11:52:29 tanimura Exp $ */ #include <sys/param.h> -#include <sys/fcntl.h> +#include <sys/proc.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/lock.h> -#include <sys/proc.h> -#include <sys/mutex.h> +#include <sys/fcntl.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/systm.h> @@ -95,7 +93,6 @@ char c; int num; int argsiz; - int sostate; svr4_decode_cmd(SCARG(uap, com), dir, &c, &num, &argsiz); @@ -116,10 +113,7 @@ #if defined(DEBUG_SVR4) if (fp->f_type == DTYPE_SOCKET) { struct socket *so = (struct socket *)fp->f_data; - SOCK_LOCK(so); - sostate = so->so_state; - SOCK_UNLOCK(so); - DPRINTF(("<<< IN: so_state = 0x%x\n", sostate)); + DPRINTF(("<<< IN: so_state = 0x%x\n", so->so_state)); } #endif @@ -164,10 +158,7 @@ struct socket *so; so = (struct socket *)fp->f_data; - SOCK_LOCK(so); - sostate = so->so_state; - SOCK_UNLOCK(so); - DPRINTF((">>> OUT: so_state = 0x%x\n", sostate)); + DPRINTF((">>> OUT: so_state = 0x%x\n", so->so_state)); } #endif error = (*fun)(fp, td, retval, SCARG(uap, fd), cmd, SCARG(uap, data)); ==== //depot/projects/smpng/sys/conf/NOTES#14 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys/<arch>/conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1034 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1035 2002/05/31 06:28:13 brooks Exp $ # # @@ -418,7 +418,7 @@ device fddi #Generic FDDI device arcnet #Generic Arcnet device sppp #Generic Synchronous PPP -device loop 1 #Network loopback device +device loop #Network loopback device device bpf #Berkeley packet filter device disc #Discard device (ds0, ds1, etc) device tap #Virtual Ethernet driver ==== //depot/projects/smpng/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.642 2002/05/30 17:37:34 takawata Exp $ +# $FreeBSD: src/sys/conf/files,v 1.643 2002/06/03 09:14:12 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -357,6 +357,8 @@ dev/hea/eni_receive.c optional hea dev/hea/eni_transmit.c optional hea dev/hea/eni_vcm.c optional hea +dev/hea/hea_pci.c optional hea pci +dev/hea/hea_freebsd.c optional hea dev/hfa/fore_buffer.c optional hfa dev/hfa/fore_command.c optional hfa dev/hfa/fore_globals.c optional hfa ==== //depot/projects/smpng/sys/conf/files.i386#24 (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.400 2002/05/19 01:27:14 marcel Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.401 2002/06/03 22:30:35 pdeuskar Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -106,8 +106,7 @@ dev/ed/if_ed_isa.c optional ed isa dev/eisa/eisaconf.c optional eisa dev/em/if_em.c optional em -dev/em/if_em_fxhw.c optional em -dev/em/if_em_phy.c optional em +dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/conf/files.pc98#24 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.232 2002/05/21 04:13:08 non Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.233 2002/06/03 22:30:35 pdeuskar Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -104,8 +104,7 @@ dev/ct/ct_isa.c optional ct isa dev/ed/if_ed_cbus.c optional ed isa dev/em/if_em.c optional em -dev/em/if_em_fxhw.c optional em -dev/em/if_em_phy.c optional em +dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional gdc dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/conf/options#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.319 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.320 2002/06/02 04:32:52 alfred Exp $ # # On the handling of kernel options # @@ -265,7 +265,6 @@ ETHER_SNAP opt_ef.h MROUTING opt_mrouting.h INET opt_inet.h -SOMAXCONN opt_inet.h INET6 opt_inet6.h IPSEC opt_ipsec.h IPSEC_ESP opt_ipsec.h ==== //depot/projects/smpng/sys/dev/awi/awi.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.19 2002/04/19 22:28:09 imp Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.20 2002/05/31 03:27:34 imp Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -86,14 +86,6 @@ */ #include "opt_inet.h" -#if defined(__FreeBSD__) && __FreeBSD__ >= 4 -#define NBPFILTER 1 -#elif defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include "bpf.h" -#define NBPFILTER NBPF -#else -#include "bpfilter.h" -#endif #include <sys/param.h> #include <sys/systm.h> @@ -134,6 +126,15 @@ #endif #endif +#if defined(__FreeBSD__) && __FreeBSD_version >= 400000 +#define NBPFILTER 1 +#elif defined(__FreeBSD__) && __FreeBSD_version >= 300000 +#include "bpf.h" +#define NBPFILTER NBPF +#else +#include "bpfilter.h" +#endif + #if NBPFILTER > 0 #include <net/bpf.h> #include <net/bpfdesc.h> @@ -464,7 +465,7 @@ u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; #ifdef __FreeBSD_version #if __FreeBSD_version < 500028 - struct proc *mythread = curproc; /* Little lie */ + struct proc *mythread = curproc; /* name a white lie */ #else struct thread *mythread = curthread; #endif ==== //depot/projects/smpng/sys/dev/awi/awivar.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awivar.h,v 1.12 2000/07/21 04:48:56 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.7 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.8 2002/05/31 03:27:34 imp Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -95,7 +95,7 @@ void *sc_ih; /* interrupt handler */ #endif #ifdef __FreeBSD__ -#if __FreeBSD__ >= 4 +#if __FreeBSD_version >= 40000 struct { char dv_xname[64]; /*XXX*/ } sc_dev; ==== //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#6 (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/cardbus/cardbus_cis.c,v 1.19 2002/05/30 17:37:38 takawata Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.20 2002/06/01 16:20:27 alfred Exp $ */ /* @@ -586,8 +586,8 @@ static int barsort(const void *a, const void *b) { - return ((*(const struct resource_list_entry **)b)->count - - (*(const struct resource_list_entry **)a)->count); + return ((*(const struct resource_list_entry * const *)b)->count - + (*(const struct resource_list_entry * const *)a)->count); } static int ==== //depot/projects/smpng/sys/dev/ct/ct_machdep.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.4 2002/05/30 07:30:42 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.5 2002/06/01 08:29:12 ru Exp $ */ /* $NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $ */ /* $NetBSD$ */ @@ -208,7 +208,7 @@ CT_BUS_WEIGHT(chp) } -#if defined(__i386__) +#if defined(__i386__) && 0 #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) #else /* !__i386__ */ #define SOFT_INTR_REQUIRED(slp) ==== //depot/projects/smpng/sys/dev/drm/drm_dma.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #ifdef __FreeBSD__ @@ -573,7 +573,7 @@ dev->irq = irq; DRM_OS_UNLOCK; - DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq ); + DRM_DEBUG( "%s: irq=%d\n", __func__, irq ); dev->context_flag = 0; dev->interrupt_flag = 0; @@ -642,7 +642,7 @@ if ( !irq ) return DRM_OS_ERR(EINVAL); - DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq ); + DRM_DEBUG( "%s: irq=%d\n", __func__, irq ); DRIVER_UNINSTALL(); ==== //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.4 2002/05/06 23:34:13 bde Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.5 2002/05/31 23:19:50 anholt Exp $ */ #include <sys/param.h> @@ -119,7 +119,7 @@ #define DRM_OS_READMEMORYBARRIER \ { \ int xchangeDummy; \ - DRM_DEBUG("%s\n", __FUNCTION__); \ + DRM_DEBUG("%s\n", __func__); \ __asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy)); \ __asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;" \ " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;" \ @@ -242,18 +242,19 @@ /* Macros to make printf easier */ #define DRM_ERROR(fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) + printf("error: [" DRM_NAME ":%s] *ERROR* " fmt , \ + __func__, ##arg) #define DRM_MEM_ERROR(area, fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \ - DRM(mem_stats)[area].name , ##arg) + printf("error: [" DRM_NAME ":%s:%s] *ERROR* " fmt , \ + __func__, DRM(mem_stats)[area].name , ##arg) #define DRM_INFO(fmt, arg...) printf("info: " "[" DRM_NAME "] " fmt , ##arg) #if DRM_DEBUG_CODE -#define DRM_DEBUG(fmt, arg...) \ - do { \ - if (DRM(flags) & DRM_FLAG_DEBUG) \ - printf("[" DRM_NAME ":" __FUNCTION__ "] " fmt , \ - ##arg); \ +#define DRM_DEBUG(fmt, arg...) \ + do { \ + if (DRM(flags) & DRM_FLAG_DEBUG) \ + printf("[" DRM_NAME ":%s] " fmt , \ + __func__, ##arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0) ==== //depot/projects/smpng/sys/dev/drm/drm_scatter.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #define __NO_VERSION__ @@ -72,7 +72,7 @@ pmd_t *pmd; pte_t *pte; - DRM_DEBUG( "%s\n", __FUNCTION__ ); + DRM_DEBUG( "%s\n", __func__ ); if ( dev->sg ) return DRM_OS_ERR(EINVAL); ==== //depot/projects/smpng/sys/dev/drm/gamma_drv.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * - * $FreeBSD: src/sys/dev/drm/gamma_drv.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/gamma_drv.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #ifndef _GAMMA_DRV_H_ @@ -47,7 +47,7 @@ if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \ dev->lock.pid != DRM_OS_CURRENTPID ) { \ DRM_ERROR( "%s called without lock held\n", \ - __FUNCTION__ ); \ + __func__ ); \ return DRM_OS_ERR(EINVAL); \ } \ } while (0) ==== //depot/projects/smpng/sys/dev/drm/mga_dma.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206041421.g54ELtE30271>