PERFORCE change 36658 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Aug 22 00:53:52 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36658
Change 36658 by marcel at marcel_nfs on 2003/08/22 00:53:18
IFC @36652
Affected files ...
.. //depot/projects/uart/alpha/alpha/api_up1000.c#4 integrate
.. //depot/projects/uart/alpha/alpha/autoconf.c#2 integrate
.. //depot/projects/uart/alpha/alpha/busspace.c#2 integrate
.. //depot/projects/uart/alpha/alpha/db_disasm.c#2 integrate
.. //depot/projects/uart/alpha/alpha/db_interface.c#2 integrate
.. //depot/projects/uart/alpha/alpha/dec_1000a.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_kn300.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_st550.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_st6600.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dump_machdep.c#2 integrate
.. //depot/projects/uart/alpha/alpha/genassym.c#2 integrate
.. //depot/projects/uart/alpha/alpha/ieee_float.c#2 integrate
.. //depot/projects/uart/alpha/alpha/in_cksum.c#2 integrate
.. //depot/projects/uart/alpha/alpha/pmap.c#8 integrate
.. //depot/projects/uart/alpha/alpha/promcons.c#2 integrate
.. //depot/projects/uart/alpha/alpha/sgmap.c#2 integrate
.. //depot/projects/uart/alpha/alpha/sys_machdep.c#2 integrate
.. //depot/projects/uart/alpha/alpha/trap.c#2 integrate
.. //depot/projects/uart/alpha/isa/isa.c#2 integrate
.. //depot/projects/uart/alpha/isa/isa_dma.c#3 integrate
.. //depot/projects/uart/alpha/isa/mcclock_isa.c#2 integrate
.. //depot/projects/uart/alpha/linux/linux_dummy.c#2 integrate
.. //depot/projects/uart/alpha/linux/linux_genassym.c#2 integrate
.. //depot/projects/uart/alpha/linux/linux_machdep.c#2 integrate
.. //depot/projects/uart/alpha/linux/linux_sysvec.c#2 integrate
.. //depot/projects/uart/alpha/mcbus/mcmem.c#2 integrate
.. //depot/projects/uart/alpha/mcbus/mcpcia.c#2 integrate
.. //depot/projects/uart/alpha/osf1/imgact_osf1.c#2 integrate
.. //depot/projects/uart/alpha/osf1/osf1_ioctl.c#2 integrate
.. //depot/projects/uart/alpha/osf1/osf1_mount.c#2 integrate
.. //depot/projects/uart/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/uart/alpha/osf1/osf1_sysvec.c#2 integrate
.. //depot/projects/uart/alpha/pci/apecs_pci.c#2 integrate
.. //depot/projects/uart/alpha/pci/bwx.c#2 integrate
.. //depot/projects/uart/alpha/pci/cia_pci.c#2 integrate
.. //depot/projects/uart/alpha/pci/irongate.c#3 integrate
.. //depot/projects/uart/alpha/pci/irongate_pci.c#2 integrate
.. //depot/projects/uart/alpha/pci/lca_pci.c#2 integrate
.. //depot/projects/uart/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/uart/alpha/pci/swiz.c#2 integrate
.. //depot/projects/uart/alpha/pci/t2.c#3 integrate
.. //depot/projects/uart/alpha/pci/t2_pci.c#2 integrate
.. //depot/projects/uart/alpha/pci/tsunami.c#3 integrate
.. //depot/projects/uart/alpha/pci/tsunami_pci.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/dwlpx.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/gbus.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/kftxx.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/mcclock_tlsb.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/tlsbcpu.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/tlsbmem.c#2 integrate
.. //depot/projects/uart/alpha/tlsb/zs_tlsb.c#2 integrate
.. //depot/projects/uart/amd64/ia32/ia32_proto.h#2 integrate
.. //depot/projects/uart/amd64/ia32/ia32_syscall.h#2 integrate
.. //depot/projects/uart/amd64/ia32/ia32_syscalls.c#2 integrate
.. //depot/projects/uart/amd64/ia32/ia32_sysent.c#2 integrate
.. //depot/projects/uart/amd64/ia32/syscalls.master#2 integrate
.. //depot/projects/uart/boot/i386/boot2/boot1.s#2 integrate
.. //depot/projects/uart/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/uart/conf/NOTES#9 integrate
.. //depot/projects/uart/conf/files#15 integrate
.. //depot/projects/uart/conf/options#9 integrate
.. //depot/projects/uart/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/uart/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/uart/dev/acpica/acpi_pcib.c#3 integrate
.. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/uart/dev/acpica/acpi_pcib_pci.c#2 integrate
.. //depot/projects/uart/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/uart/dev/adlink/adlink.c#2 integrate
.. //depot/projects/uart/dev/advansys/adv_pci.c#3 integrate
.. //depot/projects/uart/dev/advansys/adw_pci.c#3 integrate
.. //depot/projects/uart/dev/aic/aic.c#2 integrate
.. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#3 integrate
.. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#3 integrate
.. //depot/projects/uart/dev/amd/amd.c#5 integrate
.. //depot/projects/uart/dev/amr/amr.c#2 integrate
.. //depot/projects/uart/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/uart/dev/an/if_an.c#3 integrate
.. //depot/projects/uart/dev/an/if_an_pci.c#4 integrate
.. //depot/projects/uart/dev/ar/if_ar_pci.c#2 integrate
.. //depot/projects/uart/dev/asr/asr.c#2 integrate
.. //depot/projects/uart/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/uart/dev/bge/if_bge.c#8 integrate
.. //depot/projects/uart/dev/bktr/bktr_audio.c#3 integrate
.. //depot/projects/uart/dev/bktr/bktr_card.c#2 integrate
.. //depot/projects/uart/dev/bktr/bktr_core.c#4 integrate
.. //depot/projects/uart/dev/bktr/bktr_i2c.c#2 integrate
.. //depot/projects/uart/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/uart/dev/bktr/bktr_tuner.c#2 integrate
.. //depot/projects/uart/dev/buslogic/bt_pci.c#3 integrate
.. //depot/projects/uart/dev/ciss/ciss.c#5 integrate
.. //depot/projects/uart/dev/digi/digi_pci.c#2 integrate
.. //depot/projects/uart/dev/dpt/dpt_pci.c#3 integrate
.. //depot/projects/uart/dev/drm/drm_os_freebsd.h#3 integrate
.. //depot/projects/uart/dev/ed/if_ed_pci.c#2 integrate
.. //depot/projects/uart/dev/em/if_em.h#5 integrate
.. //depot/projects/uart/dev/em/if_em_osdep.h#3 integrate
.. //depot/projects/uart/dev/en/if_en_pci.c#3 integrate
.. //depot/projects/uart/dev/fatm/if_fatm.c#7 integrate
.. //depot/projects/uart/dev/fb/boot_font.c#2 integrate
.. //depot/projects/uart/dev/fb/gfb.c#2 integrate
.. //depot/projects/uart/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/uart/dev/fb/tga.c#2 integrate
.. //depot/projects/uart/dev/firewire/fwcrom.c#2 integrate
.. //depot/projects/uart/dev/firewire/fwohci_pci.c#6 integrate
.. //depot/projects/uart/dev/firewire/sbp.c#7 integrate
.. //depot/projects/uart/dev/fxp/if_fxp.c#8 integrate
.. //depot/projects/uart/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/uart/dev/gx/if_gx.c#2 integrate
.. //depot/projects/uart/dev/hatm/if_hatm.c#7 integrate
.. //depot/projects/uart/dev/hatm/if_hatm_intr.c#3 integrate
.. //depot/projects/uart/dev/hatm/if_hatm_ioctl.c#6 integrate
.. //depot/projects/uart/dev/hatm/if_hatm_rx.c#4 integrate
.. //depot/projects/uart/dev/hatm/if_hatm_tx.c#5 integrate
.. //depot/projects/uart/dev/hea/eni.h#2 integrate
.. //depot/projects/uart/dev/hfa/fore_buffer.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_command.c#3 integrate
.. //depot/projects/uart/dev/hfa/fore_globals.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_if.c#3 integrate
.. //depot/projects/uart/dev/hfa/fore_init.c#3 integrate
.. //depot/projects/uart/dev/hfa/fore_intr.c#3 integrate
.. //depot/projects/uart/dev/hfa/fore_load.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_output.c#3 integrate
.. //depot/projects/uart/dev/hfa/fore_receive.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_stats.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_timer.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_transmit.c#2 integrate
.. //depot/projects/uart/dev/hfa/fore_vcm.c#3 integrate
.. //depot/projects/uart/dev/hifn/hifn7751.c#4 integrate
.. //depot/projects/uart/dev/hme/if_hme_pci.c#3 integrate
.. //depot/projects/uart/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/uart/dev/ida/ida_pci.c#3 integrate
.. //depot/projects/uart/dev/iir/iir_pci.c#3 integrate
.. //depot/projects/uart/dev/ips/ips.h#2 integrate
.. //depot/projects/uart/dev/ips/ips_disk.h#2 integrate
.. //depot/projects/uart/dev/isp/isp_pci.c#3 integrate
.. //depot/projects/uart/dev/mii/brgphy.c#5 integrate
.. //depot/projects/uart/dev/mii/dcphy.c#2 integrate
.. //depot/projects/uart/dev/mlx/mlx_pci.c#3 integrate
.. //depot/projects/uart/dev/mly/mly.c#4 integrate
.. //depot/projects/uart/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/uart/dev/musycc/musycc.c#2 integrate
.. //depot/projects/uart/dev/my/if_my.c#2 integrate
.. //depot/projects/uart/dev/nge/if_nge.c#3 integrate
.. //depot/projects/uart/dev/patm/if_patm_attach.c#3 integrate
.. //depot/projects/uart/dev/pccard/pccard.c#2 integrate
.. //depot/projects/uart/dev/pccard/pccarddevs#8 integrate
.. //depot/projects/uart/dev/pccard/pccarddevs.h#8 integrate
.. //depot/projects/uart/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/uart/dev/pci/eisa_pci.c#2 integrate
.. //depot/projects/uart/dev/pci/fixup_pci.c#2 integrate
.. //depot/projects/uart/dev/pci/ignore_pci.c#2 integrate
.. //depot/projects/uart/dev/pci/isa_pci.c#3 integrate
.. //depot/projects/uart/dev/pci/pci.c#5 integrate
.. //depot/projects/uart/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/uart/dev/pci/pci_private.h#3 integrate
.. //depot/projects/uart/dev/pci/pci_user.c#2 integrate
.. //depot/projects/uart/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/uart/dev/pci/pcivar.h#2 integrate
.. //depot/projects/uart/dev/ppbus/ppb_base.c#2 integrate
.. //depot/projects/uart/dev/pst/pst-iop.c#2 integrate
.. //depot/projects/uart/dev/pst/pst-pci.c#2 integrate
.. //depot/projects/uart/dev/pst/pst-raid.c#2 integrate
.. //depot/projects/uart/dev/puc/pucdata.c#6 integrate
.. //depot/projects/uart/dev/rp/rp_pci.c#2 integrate
.. //depot/projects/uart/dev/safe/safe.c#4 integrate
.. //depot/projects/uart/dev/sbni/if_sbni_pci.c#2 integrate
.. //depot/projects/uart/dev/sbsh/if_sbsh.c#2 integrate
.. //depot/projects/uart/dev/si/si_pci.c#2 integrate
.. //depot/projects/uart/dev/sio/sio_pci.c#2 integrate
.. //depot/projects/uart/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/uart/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/csa.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/csamidi.c#2 integrate
.. //depot/projects/uart/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/ich.c#6 integrate
.. //depot/projects/uart/dev/sound/pci/maestro.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/maestro3.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/neomagic.c#2 integrate
.. //depot/projects/uart/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/uart/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/uart/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/uart/dev/sound/pcm/ac97.h#2 integrate
.. //depot/projects/uart/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/uart/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/uart/dev/sr/if_sr_pci.c#2 integrate
.. //depot/projects/uart/dev/stg/tmc18c30_pci.c#2 integrate
.. //depot/projects/uart/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/uart/dev/tdfx/tdfx_pci.c#2 integrate
.. //depot/projects/uart/dev/tga/tga_pci.c#2 integrate
.. //depot/projects/uart/dev/trm/trm.c#5 integrate
.. //depot/projects/uart/dev/twe/twe_compat.h#4 integrate
.. //depot/projects/uart/dev/tx/if_tx.c#4 integrate
.. //depot/projects/uart/dev/txp/if_txp.c#3 integrate
.. //depot/projects/uart/dev/ubsec/ubsec.c#4 integrate
.. //depot/projects/uart/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/uart/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/uart/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/uart/dev/usb/umass.c#5 integrate
.. //depot/projects/uart/dev/usb/usbdevs#5 integrate
.. //depot/projects/uart/dev/usb/usbdevs.h#4 integrate
.. //depot/projects/uart/dev/usb/usbdevs_data.h#4 integrate
.. //depot/projects/uart/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/uart/dev/wi/if_wi_pccard.c#7 integrate
.. //depot/projects/uart/dev/wi/if_wi_pci.c#5 integrate
.. //depot/projects/uart/dev/xe/if_xe_pccard.c#2 integrate
.. //depot/projects/uart/i386/i386/pmap.c#13 integrate
.. //depot/projects/uart/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/uart/ia64/ia32/ia32_proto.h#2 integrate
.. //depot/projects/uart/ia64/ia32/ia32_syscall.h#2 integrate
.. //depot/projects/uart/ia64/ia32/ia32_sysent.c#2 integrate
.. //depot/projects/uart/ia64/ia32/syscalls.master#2 integrate
.. //depot/projects/uart/kern/kern_mac.c#3 integrate
.. //depot/projects/uart/kern/kern_mib.c#2 integrate
.. //depot/projects/uart/kern/kern_tc.c#6 integrate
.. //depot/projects/uart/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/uart/modules/Makefile#5 integrate
.. //depot/projects/uart/modules/mac_stub/Makefile#1 branch
.. //depot/projects/uart/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/uart/netinet/igmp.c#2 integrate
.. //depot/projects/uart/netinet/in.h#3 integrate
.. //depot/projects/uart/netinet/in_pcb.h#2 integrate
.. //depot/projects/uart/netinet/in_var.h#2 integrate
.. //depot/projects/uart/netinet/ip_icmp.c#2 integrate
.. //depot/projects/uart/netinet/ip_output.c#4 integrate
.. //depot/projects/uart/netinet/ip_var.h#3 integrate
.. //depot/projects/uart/netinet/raw_ip.c#4 integrate
.. //depot/projects/uart/netinet/tcp_subr.c#2 integrate
.. //depot/projects/uart/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/uart/pci/agp.c#2 integrate
.. //depot/projects/uart/pci/agp_ali.c#2 integrate
.. //depot/projects/uart/pci/agp_amd.c#2 integrate
.. //depot/projects/uart/pci/agp_i810.c#2 integrate
.. //depot/projects/uart/pci/agp_intel.c#2 integrate
.. //depot/projects/uart/pci/agp_sis.c#2 integrate
.. //depot/projects/uart/pci/agp_via.c#2 integrate
.. //depot/projects/uart/pci/alpm.c#2 integrate
.. //depot/projects/uart/pci/amdpm.c#2 integrate
.. //depot/projects/uart/pci/if_dc.c#9 integrate
.. //depot/projects/uart/pci/if_de.c#2 integrate
.. //depot/projects/uart/pci/if_mn.c#2 integrate
.. //depot/projects/uart/pci/if_pcn.c#3 integrate
.. //depot/projects/uart/pci/if_rl.c#10 integrate
.. //depot/projects/uart/pci/if_sf.c#3 integrate
.. //depot/projects/uart/pci/if_sis.c#7 integrate
.. //depot/projects/uart/pci/if_sk.c#3 integrate
.. //depot/projects/uart/pci/if_ste.c#3 integrate
.. //depot/projects/uart/pci/if_ti.c#3 integrate
.. //depot/projects/uart/pci/if_tl.c#2 integrate
.. //depot/projects/uart/pci/if_vr.c#3 integrate
.. //depot/projects/uart/pci/if_wb.c#3 integrate
.. //depot/projects/uart/pci/if_xl.c#6 integrate
.. //depot/projects/uart/pci/intpm.c#2 integrate
.. //depot/projects/uart/pci/meteor.c#3 integrate
.. //depot/projects/uart/pci/ncr.c#3 integrate
.. //depot/projects/uart/pci/viapm.c#2 integrate
.. //depot/projects/uart/pci/xrpu.c#2 integrate
.. //depot/projects/uart/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/uart/security/mac_bsdextended/mac_bsdextended.c#3 integrate
.. //depot/projects/uart/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/uart/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/uart/security/mac_none/mac_none.c#2 integrate
.. //depot/projects/uart/security/mac_stub/mac_stub.c#1 branch
.. //depot/projects/uart/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/uart/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/uart/sys/mac.h#2 integrate
.. //depot/projects/uart/sys/mac_policy.h#2 integrate
.. //depot/projects/uart/sys/sysctl.h#3 integrate
.. //depot/projects/uart/vm/uma_core.c#9 integrate
.. //depot/projects/uart/vm/vm_page.c#3 integrate
Differences ...
==== //depot/projects/uart/alpha/alpha/api_up1000.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.8 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -44,8 +44,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
==== //depot/projects/uart/alpha/alpha/autoconf.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.56 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.57 2003/08/22 07:20:25 imp Exp $");
#include "opt_bootp.h"
#include "opt_isa.h"
==== //depot/projects/uart/alpha/alpha/busspace.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.3 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.4 2003/08/22 07:20:25 imp Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
==== //depot/projects/uart/alpha/alpha/db_disasm.c#2 (text+ko) ====
@@ -46,7 +46,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.8 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/alpha/db_interface.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.27 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/proc.h>
==== //depot/projects/uart/alpha/alpha/dec_1000a.c#4 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.15 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -92,7 +92,7 @@
#include <alpha/pci/apecsvar.h>
#include <alpha/pci/ciavar.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
#ifndef NO_SIO
#ifndef CONSPEED
==== //depot/projects/uart/alpha/alpha/dec_2100_a50.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.16 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.17 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -49,8 +49,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
==== //depot/projects/uart/alpha/alpha/dec_2100_a500.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.15 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -42,8 +42,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/t2var.h>
#include <alpha/pci/t2reg.h>
==== //depot/projects/uart/alpha/alpha/dec_axppci_33.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.19 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.20 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -47,8 +47,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/lcavar.h>
#ifndef NO_SIO
==== //depot/projects/uart/alpha/alpha/dec_eb64plus.c#4 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.14 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.15 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -62,8 +62,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
==== //depot/projects/uart/alpha/alpha/dec_kn20aa.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.16 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.17 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -46,8 +46,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
==== //depot/projects/uart/alpha/alpha/dec_kn300.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.11 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.12 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -48,8 +48,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/mcbus/mcbusreg.h>
#include <alpha/mcbus/mcbusvar.h>
==== //depot/projects/uart/alpha/alpha/dec_st550.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.14 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.15 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -51,8 +51,8 @@
#include <machine/md_var.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
==== //depot/projects/uart/alpha/alpha/dec_st6600.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.15 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -44,8 +44,8 @@
#include <machine/intr.h>
#include <machine/rpb.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <alpha/pci/tsunamivar.h>
#ifndef NO_SIO
==== //depot/projects/uart/alpha/alpha/dump_machdep.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.4 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/alpha/genassym.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.42 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.43 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/alpha/ieee_float.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.8 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
#include <sys/types.h>
#ifdef TEST
==== //depot/projects/uart/alpha/alpha/in_cksum.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.7 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.8 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
==== //depot/projects/uart/alpha/alpha/pmap.c#8 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.134 2003/08/20 20:12:05 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1076,6 +1076,7 @@
/*
* allocate the page directory page
*/
+ VM_OBJECT_LOCK(pmap->pm_pteobj);
lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
@@ -1083,6 +1084,7 @@
vm_page_flag_clear(lev1pg, PG_BUSY);
lev1pg->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
+ VM_OBJECT_UNLOCK(pmap->pm_pteobj);
pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
if ((lev1pg->flags & PG_ZERO) == 0)
@@ -1199,12 +1201,17 @@
pt_entry_t* pte;
vm_offset_t ptepa;
vm_page_t m;
+ int is_object_locked;
/*
* Find or fabricate a new pagetable page
*/
+ if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj)))
+ VM_OBJECT_LOCK(pmap->pm_pteobj);
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
+ if ((m->flags & PG_ZERO) == 0)
+ pmap_zero_page(m);
KASSERT(m->queue == PQ_NONE,
("_pmap_allocpte: %p->queue != PQ_NONE", m));
@@ -1249,14 +1256,13 @@
*/
pmap->pm_ptphint = m;
- if ((m->flags & PG_ZERO) == 0)
- bzero((caddr_t) ALPHA_PHYS_TO_K0SEG(ptepa), PAGE_SIZE);
-
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
+ if (!is_object_locked)
+ VM_OBJECT_UNLOCK(pmap->pm_pteobj);
return m;
}
==== //depot/projects/uart/alpha/alpha/promcons.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.29 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.30 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/uart/alpha/alpha/sgmap.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.5 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/alpha/sys_machdep.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.25 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.26 2003/08/22 07:20:25 imp Exp $");
#include "opt_mac.h"
==== //depot/projects/uart/alpha/alpha/trap.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.115 2003/06/15 00:31:21 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.116 2003/08/22 07:20:25 imp Exp $");
/* #include "opt_fix_unaligned_vax_fp.h" */
#include "opt_ddb.h"
==== //depot/projects/uart/alpha/isa/isa.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.32 2003/06/10 16:57:28 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.33 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/isa/isa_dma.c#3 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.9 2003/07/01 15:51:50 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.10 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/isa/mcclock_isa.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.9 2003/06/10 16:57:28 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.10 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/uart/alpha/linux/linux_dummy.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.36 2003/06/10 17:00:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.37 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/linux/linux_genassym.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.18 2003/06/10 17:00:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.19 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/assym.h>
==== //depot/projects/uart/alpha/linux/linux_machdep.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.31 2003/06/10 17:00:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.32 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/linux/linux_sysvec.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.89 2003/06/15 00:31:22 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.90 2003/08/22 07:20:26 imp Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
==== //depot/projects/uart/alpha/mcbus/mcmem.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcmem.c,v 1.2 2003/06/10 17:02:51 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcmem.c,v 1.3 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/mcbus/mcpcia.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.26 2003/06/28 13:47:23 ticso Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.27 2003/08/22 07:20:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,8 @@
#include <alpha/mcbus/mcpciareg.h>
#include <alpha/mcbus/mcpciavar.h>
#include <alpha/pci/pcibus.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include "alphapci_if.h"
#include "pcib_if.h"
==== //depot/projects/uart/alpha/osf1/imgact_osf1.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.19 2003/06/10 17:10:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.20 2003/08/22 07:20:27 imp Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
==== //depot/projects/uart/alpha/osf1/osf1_ioctl.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.9 2003/06/10 17:10:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/osf1/osf1_mount.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.16 2003/06/22 08:41:41 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
#include "opt_mac.h"
#include "opt_nfs.h"
==== //depot/projects/uart/alpha/osf1/osf1_signal.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.34 2003/06/10 17:10:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $");
#include "opt_compat.h"
#ifndef COMPAT_43
==== //depot/projects/uart/alpha/osf1/osf1_sysvec.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.9 2003/06/10 17:10:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
==== //depot/projects/uart/alpha/pci/apecs_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.14 2003/06/10 17:27:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,8 +34,8 @@
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <machine/cpuconf.h>
#include <machine/swiz.h>
#include <machine/md_var.h>
==== //depot/projects/uart/alpha/pci/bwx.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/bwx.c,v 1.2 2003/06/10 17:27:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/bwx.c,v 1.3 2003/08/22 07:20:27 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/uart/alpha/pci/cia_pci.c#2 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/cia_pci.c,v 1.16 2003/06/10 17:27:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/cia_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,8 +98,8 @@
#include <machine/bus.h>
#include <machine/md_var.h>
#include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <machine/cpuconf.h>
#include <machine/bwx.h>
#include <machine/swiz.h>
==== //depot/projects/uart/alpha/pci/irongate.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate.c,v 1.8 2003/08/17 06:42:08 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate.c,v 1.9 2003/08/22 07:20:27 imp Exp $");
#include "opt_cpu.h"
@@ -38,8 +38,8 @@
#include <sys/rman.h>
#include <sys/malloc.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
#include <alpha/isa/isavar.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
==== //depot/projects/uart/alpha/pci/irongate_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.9 2003/06/10 17:27:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list