PERFORCE change 47583 for review
John Baldwin
jhb at FreeBSD.org
Tue Feb 24 10:59:54 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=47583
Change 47583 by jhb at jhb_slimer on 2004/02/24 10:59:26
IFC @47578.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/mem.c#13 integrate
.. //depot/projects/smpng/sys/alpha/alpha/promcons.c#16 integrate
.. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#14 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#7 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#9 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#18 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#10 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#49 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#11 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#10 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#19 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#9 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#13 integrate
.. //depot/projects/smpng/sys/coda/coda_fbsd.c#7 integrate
.. //depot/projects/smpng/sys/coda/coda_venus.c#8 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#5 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_stats.c#16 integrate
.. //depot/projects/smpng/sys/conf/majors#37 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#13 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#36 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#60 integrate
.. //depot/projects/smpng/sys/dev/adlink/adlink.c#6 integrate
.. //depot/projects/smpng/sys/dev/amr/amr.c#19 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_disk.c#13 integrate
.. //depot/projects/smpng/sys/dev/asr/asr.c#22 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#47 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#10 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#40 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#47 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#25 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#20 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#27 integrate
.. //depot/projects/smpng/sys/dev/ctau/am8530.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctau.c#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctau2fw.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctaue1fw.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctaufw.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctaug7fw.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctaureg.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctddk.c#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ctddk.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ds2153.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/hdc64570.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#1 branch
.. //depot/projects/smpng/sys/dev/ctau/lxt318.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/ng_ct.h#1 branch
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/smpng/sys/dev/dcons/dcons.c#3 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.c#20 integrate
.. //depot/projects/smpng/sys/dev/dpt/dpt.h#4 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_drv.h#16 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#14 integrate
.. //depot/projects/smpng/sys/dev/drm/r128_state.c#7 integrate
.. //depot/projects/smpng/sys/dev/fb/fb.c#10 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#31 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdev.c#15 integrate
.. //depot/projects/smpng/sys/dev/harp/if_harp.c#4 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#6 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_command.c#7 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_init.c#6 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_load.c#7 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_output.c#8 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#8 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_stats.c#4 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_transmit.c#4 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_var.h#5 integrate
.. //depot/projects/smpng/sys/dev/ida/ida.c#15 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iic.c#8 integrate
.. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#10 integrate
.. //depot/projects/smpng/sys/dev/ips/ips.c#8 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#29 integrate
.. //depot/projects/smpng/sys/dev/joy/joy.c#7 integrate
.. //depot/projects/smpng/sys/dev/kbd/kbd.c#12 integrate
.. //depot/projects/smpng/sys/dev/led/led.c#6 integrate
.. //depot/projects/smpng/sys/dev/matcd/matcd.c#4 integrate
.. //depot/projects/smpng/sys/dev/mcd/mcd.c#8 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#45 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx.c#13 integrate
.. //depot/projects/smpng/sys/dev/mly/mly.c#21 integrate
.. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#17 integrate
.. //depot/projects/smpng/sys/dev/null/null.c#15 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#15 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#7 integrate
.. //depot/projects/smpng/sys/dev/ofw/openpromio.c#3 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_user.c#12 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpt.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppi.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pps.c#12 integrate
.. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.c#3 integrate
.. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#13 integrate
.. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.c#3 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#20 integrate
.. //depot/projects/smpng/sys/dev/rc/rc.c#8 integrate
.. //depot/projects/smpng/sys/dev/rp/rp.c#14 integrate
.. //depot/projects/smpng/sys/dev/sab/sab.c#15 integrate
.. //depot/projects/smpng/sys/dev/scd/scd.c#7 integrate
.. //depot/projects/smpng/sys/dev/si/si.c#12 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#39 integrate
.. //depot/projects/smpng/sys/dev/smbus/smb.c#7 integrate
.. //depot/projects/smpng/sys/dev/snp/snp.c#14 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/midi.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/midi.h#6 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#19 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#14 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#12 integrate
.. //depot/projects/smpng/sys/dev/streams/streams.c#17 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#36 integrate
.. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#8 integrate
.. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#15 integrate
.. //depot/projects/smpng/sys/dev/tdfx/tdfx_vars.h#3 integrate
.. //depot/projects/smpng/sys/dev/tga/tga_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#14 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#9 integrate
.. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#19 integrate
.. //depot/projects/smpng/sys/dev/twe/twevar.h#6 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_tty.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/ufm.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#21 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/ukbd.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/ulpt.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/urio.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.h#11 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#21 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinum.c#16 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#8 integrate
.. //depot/projects/smpng/sys/dev/zs/zs.c#12 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#27 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#29 integrate
.. //depot/projects/smpng/sys/geom/geom_ctl.c#18 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#34 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#13 integrate
.. //depot/projects/smpng/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/smpng/sys/i386/bios/smapi.c#5 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#77 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#14 integrate
.. //depot/projects/smpng/sys/i386/i386/mem.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/perfmon.c#13 integrate
.. //depot/projects/smpng/sys/i386/isa/asc.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/ctx.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/cy.c#22 integrate
.. //depot/projects/smpng/sys/i386/isa/gpib.c#9 integrate
.. //depot/projects/smpng/sys/i386/isa/gsc.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/istallion.c#11 integrate
.. //depot/projects/smpng/sys/i386/isa/mse.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#13 integrate
.. //depot/projects/smpng/sys/i386/isa/spic.c#9 integrate
.. //depot/projects/smpng/sys/i386/isa/spicreg.h#3 integrate
.. //depot/projects/smpng/sys/i386/isa/spigot.c#15 integrate
.. //depot/projects/smpng/sys/i386/isa/spkr.c#13 integrate
.. //depot/projects/smpng/sys/i386/isa/stallion.c#13 integrate
.. //depot/projects/smpng/sys/i386/isa/wt.c#9 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#8 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#13 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#11 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#12 integrate
.. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#17 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#78 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mem.c#14 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#27 integrate
.. //depot/projects/smpng/sys/ia64/ia64/ssc.c#12 integrate
.. //depot/projects/smpng/sys/ia64/include/md_var.h#14 integrate
.. //depot/projects/smpng/sys/isa/fd.c#28 integrate
.. //depot/projects/smpng/sys/isa/psm.c#21 integrate
.. //depot/projects/smpng/sys/isa/vga_isa.c#10 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#14 integrate
.. //depot/projects/smpng/sys/kern/kern_acl.c#22 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#24 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#35 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#34 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#30 integrate
.. //depot/projects/smpng/sys/kern/subr_devstat.c#13 integrate
.. //depot/projects/smpng/sys/kern/subr_log.c#13 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#42 integrate
.. //depot/projects/smpng/sys/kern/tty.c#41 integrate
.. //depot/projects/smpng/sys/kern/tty_cons.c#25 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#28 integrate
.. //depot/projects/smpng/sys/kern/tty_tty.c#12 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#32 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#58 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#67 integrate
.. //depot/projects/smpng/sys/modules/geom/Makefile#5 integrate
.. //depot/projects/smpng/sys/net/bpf.c#32 integrate
.. //depot/projects/smpng/sys/net/if.c#43 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#23 integrate
.. //depot/projects/smpng/sys/net/if_tapvar.h#3 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#29 integrate
.. //depot/projects/smpng/sys/net/if_tunvar.h#3 delete
.. //depot/projects/smpng/sys/netatm/atm_subr.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_device.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_gif.c#6 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#49 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#44 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#21 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#22 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#18 integrate
.. //depot/projects/smpng/sys/netncp/ncp_mod.c#6 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#14 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#4 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#4 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#2 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#34 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#11 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#27 integrate
.. //depot/projects/smpng/sys/pc98/pc98/mse.c#8 integrate
.. //depot/projects/smpng/sys/pc98/pc98/olpt.c#8 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#10 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#36 integrate
.. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#15 integrate
.. //depot/projects/smpng/sys/pccard/pccard.c#22 integrate
.. //depot/projects/smpng/sys/pci/agp.c#18 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#34 integrate
.. //depot/projects/smpng/sys/pci/xrpu.c#12 integrate
.. //depot/projects/smpng/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/smpng/sys/security/mac/mac_process.c#6 integrate
.. //depot/projects/smpng/sys/security/mac/mac_system.c#3 integrate
.. //depot/projects/smpng/sys/security/mac/mac_vfs.c#5 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#25 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#5 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate
.. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#20 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.h#2 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#24 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#5 integrate
.. //depot/projects/smpng/sys/security/mac_none/mac_none.c#12 integrate
.. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_partition/mac_partition.h#3 integrate
.. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#6 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#9 integrate
.. //depot/projects/smpng/sys/sys/_label.h#5 integrate
.. //depot/projects/smpng/sys/sys/conf.h#24 integrate
.. //depot/projects/smpng/sys/sys/mac.h#25 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#21 integrate
.. //depot/projects/smpng/sys/sys/param.h#56 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#24 integrate
.. //depot/projects/smpng/sys/sys/systm.h#48 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#30 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#27 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#33 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#43 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#50 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#43 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/mem.c#13 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.46 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $");
/*
* Memory special file
@@ -83,6 +83,7 @@
#define CDEV_MAJOR 2
static struct cdevsw mem_cdevsw = {
+ .d_version = D_VERSION,
.d_open = mmopen,
.d_close = mmclose,
.d_read = mmrw,
@@ -91,7 +92,7 @@
.d_mmap = memmmap,
.d_name = "mem",
.d_maj = CDEV_MAJOR,
- .d_flags = D_MEM,
+ .d_flags = D_MEM | D_NEEDGIANT,
};
struct mem_range_softc mem_range_softc;
==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#16 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.31 2003/09/26 10:52:16 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.34 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -63,16 +63,13 @@
static d_close_t promclose;
static d_ioctl_t promioctl;
-#define CDEV_MAJOR 97
static struct cdevsw prom_cdevsw = {
+ .d_version = D_VERSION,
.d_open = promopen,
.d_close = promclose,
- .d_read = ttyread,
- .d_write = ttywrite,
.d_ioctl = promioctl,
- .d_poll = ttypoll,
.d_name = "prom",
- .d_maj = CDEV_MAJOR,
+ .d_flags = D_TTY | D_NEEDGIANT,
};
==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#14 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.39 2003/09/26 19:35:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.42 2004/02/21 21:10:38 phk Exp $");
#include "opt_ddb.h"
@@ -70,16 +70,13 @@
static d_close_t zsclose;
static d_ioctl_t zsioctl;
-#define CDEV_MAJOR 135
static struct cdevsw zs_cdevsw = {
+ .d_version = D_VERSION,
.d_open = zsopen,
.d_close = zsclose,
- .d_read = ttyread,
- .d_write = ttywrite,
.d_ioctl = zsioctl,
- .d_poll = ttypoll,
.d_name = "zs",
- .d_maj = CDEV_MAJOR,
+ .d_flags = D_TTY | D_NEEDGIANT,
};
static void zsstart(struct tty *);
==== //depot/projects/smpng/sys/amd64/amd64/mem.c#7 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.112 2003/12/06 23:19:47 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.113 2004/02/21 21:10:38 phk Exp $");
/*
* Memory special file
@@ -81,6 +81,7 @@
#define CDEV_MAJOR 2
static struct cdevsw mem_cdevsw = {
+ .d_version = D_VERSION,
.d_open = mmopen,
.d_close = mmclose,
.d_read = mmrw,
@@ -89,7 +90,7 @@
.d_mmap = memmmap,
.d_name = "mem",
.d_maj = CDEV_MAJOR,
- .d_flags = D_MEM,
+ .d_flags = D_MEM | D_NEEDGIANT,
};
MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.9 2004/02/21 23:34:42 peter Exp $");
#include "opt_compat.h"
@@ -235,8 +235,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
- PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
@@ -252,7 +251,6 @@
sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
}
mtx_unlock(&psp->ps_mtx);
- PROC_UNLOCK(p);
/*
* Copy the sigframe out to the user's stack.
@@ -354,8 +352,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
- PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
@@ -371,7 +368,6 @@
sf.sf_ah = (u_int32_t)(uintptr_t)catcher;
}
mtx_unlock(&psp->ps_mtx);
- PROC_UNLOCK(p);
/*
* Copy the sigframe out to the user's stack.
==== //depot/projects/smpng/sys/cam/cam_xpt.c#18 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.135 2003/11/09 02:22:33 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.137 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -630,18 +630,18 @@
PERIPHDRIVER_DECLARE(xpt, xpt_driver);
PERIPHDRIVER_DECLARE(probe, probe_driver);
-#define XPT_CDEV_MAJOR 104
static d_open_t xptopen;
static d_close_t xptclose;
static d_ioctl_t xptioctl;
static struct cdevsw xpt_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = xptopen,
.d_close = xptclose,
.d_ioctl = xptioctl,
.d_name = "xpt",
- .d_maj = XPT_CDEV_MAJOR,
};
static struct intr_config_hook *xpt_config_hook;
==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#10 (text+ko) ====
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.37 2003/06/10 18:14:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.39 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -174,7 +174,6 @@
};
#define CHUNIT(x) (minor((x)))
-#define CH_CDEV_MAJOR 17
static d_open_t chopen;
static d_close_t chclose;
@@ -213,11 +212,12 @@
PERIPHDRIVER_DECLARE(ch, chdriver);
static struct cdevsw ch_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = chopen,
.d_close = chclose,
.d_ioctl = chioctl,
.d_name = "ch",
- .d_maj = CH_CDEV_MAJOR,
};
static void
==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#49 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.163 2004/02/18 21:36:50 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.164 2004/02/22 01:14:54 cperciva Exp $");
#ifdef _KERNEL
#include "opt_da.h"
@@ -464,11 +464,11 @@
s = splsoftcam();
periph = (struct cam_periph *)dp->d_drv1;
- unit = periph->unit_number;
if (periph == NULL) {
splx(s);
return (ENXIO);
}
+ unit = periph->unit_number;
softc = (struct da_softc *)periph->softc;
==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#11 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.38 2003/06/10 18:14:05 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.40 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,6 @@
dev_t dev;
};
-#define PASS_CDEV_MAJOR 31
static d_open_t passopen;
static d_close_t passclose;
@@ -106,11 +105,12 @@
PERIPHDRIVER_DECLARE(pass, passdriver);
static struct cdevsw pass_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = passopen,
.d_close = passclose,
.d_ioctl = passioctl,
.d_name = "pass",
- .d_maj = PASS_CDEV_MAJOR,
};
static void
==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.39 2003/06/10 18:14:05 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.41 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -116,9 +116,10 @@
PERIPHDRIVER_DECLARE(pt, ptdriver);
-#define PT_CDEV_MAJOR 61
static struct cdevsw pt_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = ptopen,
.d_close = ptclose,
.d_read = physread,
@@ -126,7 +127,6 @@
.d_ioctl = ptioctl,
.d_strategy = ptstrategy,
.d_name = "pt",
- .d_maj = PT_CDEV_MAJOR,
};
#ifndef SCSI_PT_DEFAULT_TIMEOUT
==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#19 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.98 2004/01/18 00:17:14 johan Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.100 2004/02/21 21:10:38 phk Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -423,9 +423,9 @@
#define D_TAPE 0
#endif
-#define SA_CDEV_MAJOR 14
static struct cdevsw sa_cdevsw = {
+ .d_version = D_VERSION,
.d_open = saopen,
.d_close = saclose,
.d_read = physread,
@@ -433,8 +433,7 @@
.d_ioctl = saioctl,
.d_strategy = sastrategy,
.d_name = "sa",
- .d_maj = SA_CDEV_MAJOR,
- .d_flags = D_TAPE,
+ .d_flags = D_TAPE | D_NEEDGIANT,
};
static int
==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.26 2003/06/10 18:14:05 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.28 2004/02/21 21:10:39 phk Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -153,7 +153,6 @@
#define SES_FLAG_INITIALIZED 0x04
#define SESUNIT(x) (minor((x)))
-#define SES_CDEV_MAJOR 110
static d_open_t sesopen;
static d_close_t sesclose;
@@ -175,13 +174,13 @@
PERIPHDRIVER_DECLARE(ses, sesdriver);
-static struct cdevsw ses_cdevsw =
-{
+static struct cdevsw ses_cdevsw = {
+ .d_version = D_VERSION,
.d_open = sesopen,
.d_close = sesclose,
.d_ioctl = sesioctl,
.d_name = "ses",
- .d_maj = SES_CDEV_MAJOR,
+ .d_flags = D_NEEDGIANT,
};
static void
==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.58 2003/11/09 09:17:20 tanimura Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.60 2004/02/21 21:10:39 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,8 +104,9 @@
static struct filterops targread_filtops =
{ 1, NULL, targreadfiltdetach, targreadfilt };
-#define TARG_CDEV_MAJOR 65
static struct cdevsw targ_cdevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = targopen,
.d_close = targclose,
.d_read = targread,
@@ -113,7 +114,6 @@
.d_ioctl = targioctl,
.d_poll = targpoll,
.d_name = "targ",
- .d_maj = TARG_CDEV_MAJOR,
.d_kqfilter = targkqfilter
};
==== //depot/projects/smpng/sys/coda/coda_fbsd.c#7 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.32 2004/02/21 21:10:39 phk Exp $");
#include "vcoda.h"
@@ -66,6 +66,8 @@
#define VC_DEV_NO 93
static struct cdevsw codadevsw = {
+ .d_version = D_VERSION,
+ .d_flags = D_NEEDGIANT,
.d_open = vc_nb_open,
.d_close = vc_nb_close,
.d_read = vc_nb_read,
==== //depot/projects/smpng/sys/coda/coda_venus.c#8 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.18 2003/09/07 07:43:09 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.19 2004/02/21 21:32:14 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,8 +212,7 @@
error = coda_call(mdp, Isize, &Osize, (char *)inp);
if (!error) {
-/* 5/11 *dev = udev2dev(outp->dev, 2); */
- *dev = udev2dev(outp->dev, 0);
+ *dev = udev2dev(outp->dev);
*inode = outp->inode;
}
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.21 2004/02/03 05:20:28 deischen Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.22 2004/02/21 23:38:57 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -276,7 +276,7 @@
char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)];
};
struct freebsd4_freebsd32_sigreturn_args {
- char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)];
+ char sigcntxp_l_[PADL_(const struct freebsd4_freebsd32_ucontext *)]; const struct freebsd4_freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd4_freebsd32_ucontext *)];
};
int freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *);
int freebsd4_freebsd32_sigaction(struct thread *, struct freebsd4_freebsd32_sigaction_args *);
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.21 2004/02/03 05:20:28 deischen Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.22 2004/02/21 23:38:57 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp
*/
#define FREEBSD32_SYS_syscall 0
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.12 2004/02/03 05:20:28 deischen Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.13 2004/02/21 23:38:58 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp
*/
const char *freebsd32_syscallnames[] = {
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.22 2004/02/03 05:20:28 deischen Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.23 2004/02/21 23:38:58 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp
*/
#include "opt_compat.h"
==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#7 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -475,7 +475,7 @@
struct sigaction32 *oact); }
343 MNOPROTO { int sigpending(sigset_t *set); }
344 MCOMPAT4 { int freebsd32_sigreturn( \
- const struct __ucontext *sigcntxp); }
+ const struct freebsd4_freebsd32_ucontext *sigcntxp); }
; XXX implement
345 UNIMPL sigtimedwait
; XXX implement
==== //depot/projects/smpng/sys/compat/ia32/ia32_genassym.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.3 2003/08/22 23:19:02 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.4 2004/02/21 23:35:56 peter Exp $");
#include "opt_compat.h"
@@ -17,7 +17,7 @@
ASSYM(IA32_UC_ES, offsetof(struct ia32_ucontext, uc_mcontext.mc_es));
ASSYM(IA32_UC_DS, offsetof(struct ia32_ucontext, uc_mcontext.mc_ds));
#ifdef COMPAT_FREEBSD4
-ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_sigframe, sf_uc));
+ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_sigframe4, sf_uc));
ASSYM(IA32_UC4_GS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_gs));
ASSYM(IA32_UC4_FS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_fs));
ASSYM(IA32_UC4_ES, offsetof(struct ia32_ucontext4, uc_mcontext.mc_es));
==== //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#5 (text+ko) ====
@@ -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/compat/ia32/ia32_signal.h,v 1.4 2003/11/08 07:43:44 peter Exp $
+ * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.5 2004/02/21 23:36:31 peter Exp $
*/
struct ia32_sigaltstack {
@@ -151,6 +151,7 @@
u_int32_t sf_ucontext; /* points to sf_uc */
u_int32_t sf_addr; /* undocumented 4th arg */
u_int32_t sf_ah; /* action/handler pointer */
+ /* Beware, hole due to ucontext being 16 byte aligned! */
struct ia32_ucontext sf_uc; /* = *sf_ucontext */
struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
};
==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#16 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.56 2003/11/05 23:52:54 anholt Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.57 2004/02/21 21:32:14 phk Exp $");
#include "opt_mac.h"
@@ -76,7 +76,7 @@
* in FreeBSD but block devices under Linux.
*/
if (S_ISCHR(tbuf.st_mode) &&
- (dev = udev2dev(buf->st_rdev, 0)) != NODEV) {
+ (dev = udev2dev(buf->st_rdev)) != NODEV) {
cdevsw = devsw(dev);
if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) {
tbuf.st_mode &= ~S_IFMT;
@@ -365,8 +365,8 @@
* dev_t returned from previous syscalls. Just return a bzeroed
* ustat in that case.
*/
- dev = makedev(args->dev >> 8, args->dev & 0xFF);
- if (vfinddev(dev, VCHR, &vp)) {
+ dev = udev2dev(makeudev(args->dev >> 8, args->dev & 0xFF));
+ if (dev != NODEV && vfinddev(dev, VCHR, &vp)) {
if (vp->v_mount == NULL)
return (EINVAL);
#ifdef MAC
@@ -414,7 +414,7 @@
* in FreeBSD but block devices under Linux.
*/
if (S_ISCHR(lbuf.st_mode) &&
- (dev = udev2dev(buf->st_rdev, 0)) != NODEV) {
+ (dev = udev2dev(buf->st_rdev)) != NODEV) {
cdevsw = devsw(dev);
if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) {
lbuf.st_mode &= ~S_IFMT;
==== //depot/projects/smpng/sys/conf/majors#37 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/majors,v 1.193 2004/02/14 23:18:58 scottl Exp $
+# $FreeBSD: src/sys/conf/majors,v 1.197 2004/02/23 08:55:12 phk Exp $
#
# This list is semi-obsoleted by DEVFS, but for now it still contains
# the current allocation of device major numbers.
@@ -23,25 +23,9 @@
5 *pts pseudo tty "tty" half
6 *ptc pseudo tty "master" half
7 *log system log
-9 *fd floppy disk
-10 *wt i386/isa/wt.c
-11 *spigot Video capture?
-12 *sc syscons/pcvt virtual consoles
-14 *sa SCSI "sequential access devices"
-16 *lpt PC parallel printer port
-17 *ch SCSI changer
-18 *nmdm nullmodem back-to-back tty ports
19 *tw X-10 power interface
-20 *ng_device Netgraph
-21 *psm PS/2 Mouse
22 *fd (/dev/stdin etc)
-23 *bpf Berkeley Packet Filter
-26 *spkr PC speaker (/dev/spkr)
-27 *mse Microsoft bus-mouse
-28 *sio 16450/16550 serial
-29 *mcd Mitsumi CDROM interface <mdodd>
30 *snd sound driver system
-31 *pass SCSI "Application Pass-Thru"
32 lkmc Loadable Kernel Module Controller
33 lkm assigned to Loadable Kernel Modules
34 lkm assigned to Loadable Kernel Modules
@@ -49,110 +33,52 @@
36 lkm assigned to Loadable Kernel Modules
37 lkm assigned to Loadable Kernel Modules
38 lkm assigned to Loadable Kernel Modules
-39 *apm Advanced Power Management also ACPI
-40 *ctx Cortex
42 *cx Cronyx/Sigma serial adapter
43 vn vnode "disk" device (retired)
-44 *gp GPIB
-45 *scd Sony CDROM interface <mdodd>
46 - -
-47 *gsc Genius Scanner
-48 *cy Cyclades
-51 *joy joystick
-52 *tun IP tunnel device
-53 *snp tty snoop
54 OLDnic ISDN system
-55 *i4b_ctl ISDN4BSD
-56 *i4b_tel ISDN4BSD
-57 *i4b_rbch ISDN4BSD
58 - Was dgb: Digiboard PC/Xe
-59 *i4b_trace ISDN4BSD
-60 *i4b_i4bdrv ISDN4BSD
-61 *pt SCSI "processor target"
62 worm SCSI "worm type"
-63 *rc Riscom/8 driver
64 ?? Talisman
-65 *targ SCSI target sample driver
66 labpc National Instruments LabPC
67 - was meteor Matrox Meteor video capture
-68 *si Specialix SI/XIO (peter at freebsd.org)
-69 *wcd ATAPI CDROM client of "wd"
70 crypto Device-independent crypto interface (from openbsd)
-71 *asc AmiScan driver
-72 *stl Stallion (cd1400 based) (gerg at stallion.oz.au)
74 *ccd concatenated disk
-75 *stli Stallion (intelligent cdk based) (gerg at stallion.oz.au)
76 scc IBM Smart Capture Card (ohashi at mickey.ai.kyutech.ac.jp)
-77 cyy Cyclades Ye/PCI serial card
+77 - -
78 pci PCI bus
79 *ipl IP Filter
80 xdcp Assigned to Chris Ficklin <chris at serengeti.com>
-81 *rp RocketPort/Steve Gericke <steveg at comtrol.com>
-82 *ppi Generic Parallel I/O <Nicolas.Souchu at prism.uvsq.fr>
83 can CAN16-2 CAN-PC Interface
84 dtfp Datum Time and Frequency processor (louie at UU.NET)
85 vesa VESA support device (j_mini at efn.org)
86 alog Industrial Computer Source AIO8-P driver (deprecated)
87 wfd ATAPI floppy client of "wd"
-88 *dpt DPT RAID Controller <shimon at i-connect.net>
-89 *pps Pulse-Per-Second timing interface
90 wst ATAPI tape client of "wd"
-91 *vinum Volume manager
92 *bktr Bt848 video capture driver (hasty at star-gate.com)
93 *coda CODA filesystem.
96 altq alternate queueing (including cbq, red, wfq)
-97 *prom Alpha PROM console
98 loe Loopback pseudo-ethernet (sbabkin at dcn.att.com)
99 ct Cronyx/Tau serial adaptor
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list